Attachment #60349 for bug #76127

Lines 2-11 Link Here

(-)1.0.7.orig/gyach/Makefile.am (-4 / +3 lines)
2		2
3	SUBDIRS = src	3	SUBDIRS = src
4		4
5	EXTRA_DIST = gyach.glade sample.gyachrc sample.ignore.list \	5	EXTRA_DIST = sample.gyachrc sample.ignore.list sample.ignore.regex \
6	sample.ignore.regex BUGS depcomp scripts/my-gtk-config \	6	BUGS depcomp scripts/my-gtk-config \
7	README.FreeBSD README.NetBSD README.MacOSX README.Win32 \	7	gyache-help-short.txt PHROZEN_SMOKE_README.txt
8	src/interface.c.gtk2.patch
9		8
10	install-data-local:	9	install-data-local:
11	@$(NORMAL_INSTALL)	10	@$(NORMAL_INSTALL)

Lines 1-7 Link Here

(-)1.0.7.orig/gyach/configure.in (-90 / +127 lines)
1	dnl Process this file with autoconf to produce a configure script.	1	dnl Process this file with autoconf to produce a configure script.
2		2
3	AC_INIT(configure.in)	3	dnl Is there actually anyone who understands how this autoconf animal works?
4	AM_INIT_AUTOMAKE(gyach, 0.9.2)	4	dnl Feel free to clean it up if you do....
		5
		6	AC_INIT
		7	AC_CONFIG_SRCDIR([configure.in])
		8	AM_INIT_AUTOMAKE(gyache, 1.0.7)
5	AM_CONFIG_HEADER(config.h)	9	AM_CONFIG_HEADER(config.h)
6		10
7	AC_ISC_POSIX	11	AC_ISC_POSIX
Lines 9-91 Link Here
9	AM_PROG_CC_STDC	13	AM_PROG_CC_STDC
10	AC_HEADER_STDC	14	AC_HEADER_STDC
11		15
12	AC_ARG_ENABLE(gtk_v2,	16	dnl configure libtool. this is for adding the -lltdl linker flag.
13	[ --disable-gtk_v2 disable gtk v2.0.x support])	17	AC_LIBLTDL_INSTALLABLE
14	AC_ARG_ENABLE(gdk-pixbuf,	18	AC_PROG_LIBTOOL
15	[ --disable-gdk-pixbuf disable use of gdk-pixbuf (with gtk v1.x)],	19	AC_SUBST(LIBLTDL)
16	gdk_pixbuf=$enableval, gdk_pixbuf=yes)	20
17	AC_ARG_ENABLE(pixmaps,	21	dnl stolen from gdm (who stole it from gconf..)
18	[ --disable-pixmaps disable remote user status pixmaps])	22	# find the actual value for $prefix that we'll end up with
		23	REAL_PREFIX=
		24	if test "x$prefix" = "xNONE"; then
		25	REAL_PREFIX=$ac_default_prefix
		26	else
		27	REAL_PREFIX=$prefix
		28	fi
		29	old_prefix=$prefix
		30	prefix=$REAL_PREFIX
		31
		32	REAL_EXEC_PREFIX=
		33	if test "x$exec_prefix" = "xNONE"; then
		34	REAL_EXEC_PREFIX=$prefix
		35	else
		36	REAL_EXEC_PREFIX=$exec_prefix
		37	fi
		38	old_exec_prefix=$exec_prefix
		39	exec_prefix=$REAL_EXEC_PREFIX
		40
		41
		42	dnl AC_ARG_ENABLE(gtk_v2,
		43	dnl [ --disable-gtk_v2 disable gtk v2.0.x support])
		44	dnl AC_ARG_ENABLE(gdk-pixbuf,
		45	dnl [ --disable-gdk-pixbuf disable use of gdk-pixbuf (with gtk v1.x)],
		46	dnl gdk_pixbuf=$enableval, gdk_pixbuf=yes)
		47	dnl AC_ARG_ENABLE(pixmaps,
		48	dnl [ --disable-pixmaps disable remote user status pixmaps])
19	AC_ARG_ENABLE(threads,	49	AC_ARG_ENABLE(threads,
20	[ --disable-threads disable use of pthread_create])	50	[ --disable-threads disable use of pthread_create])
21	AC_ARG_ENABLE(debug,	51	AC_ARG_ENABLE(debug,
22	[ --enable-debug=LEVEL enable debug messages at specified level])	52	[ --enable-debug=LEVEL enable debug messages at specified level])
23	dnl AC_ARG_ENABLE(interface,
24	dnl [ --enable-interface=type use "type" widget for main chat text [text/xtext/html]] )
25		53
		54	dnl GTK_CFLAGS=`pkg-config --cflags gtk+-2.0 gthread-2.0 libgtkhtml-2.0 2>/dev/null`
		55	dnl ESD_LIBS=`esd-config --cflags`
		56	dnl ESD_LIBS=`esd-config --libs`
		57
		58	AC_SUBST(CFLAGS)
		59	AC_SUBST(LDFLAGS)
		60
		61	AC_DEFINE(USE_GTK2,[],[use GTK+ v2.x])
		62	GTK_REQUIRED_VERSION=2.0
		63	PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED_VERSION)
		64	AC_SUBST(GTK_CFLAGS)
		65	AC_SUBST(GTK_LIBS)
		66
		67	GTHREAD_REQUIRED_VERSION=2.0
		68	PKG_CHECK_MODULES(GTHREAD, gthread-2.0 >= $GTHREAD_REQUIRED_VERSION)
		69	AC_SUBST(GHTREAD_CFLAGS)
		70	AC_SUBST(GTHREAD_LIBS)
		71
		72	GTKHTML_REQUIRED_VERSION=2.0
		73	PKG_CHECK_MODULES(GTKHTML, libgtkhtml-2.0 >= $GTKHTML_REQUIRED_VERSION)
		74	AC_SUBST(GTKHTML_CFLAGS)
		75	AC_SUBST(GTKHTML_LIBS)
		76
		77	dnl I honsestly dont know what version is requred of esd
		78	dnl or if it would be better to:
		79	dnl ESOUND_LIBS=`esd-config --libs`
		80	dnl AC_SUBST(ESOUND_LIBS)
		81	ESOUND_REQUIRED_VERSION=0.2
		82	PKG_CHECK_MODULES(ESOUND, esound >= $ESOUND_REQUIRED_VERSION)
		83	AC_SUBST(ESOUND_CFLAGS)
		84	AC_SUBST(ESOUND_LIBS)
26		85
27	if test "x$enable_gtk_v2" != "xno"; then
28	printf "checking for GTK - version >= 2.0.0... "
29	GTK_CFLAGS=`pkg-config --cflags gtk+-2.0 gthread-2.0 2> /dev/null`
30	else
31	GTK_CFLAGS=""
32	fi
33		86
34	if test "x${GTK_CFLAGS}" != "x"; then	87	if test "$enable_threads" != "no"; then
35	if test "x$enable_gtk_v2" != "xno"; then	88	GTK_LIBS=`pkg-config --libs gtk+-2.0 gthread-2.0 libgtkhtml-2.0 2>/dev/null`
36	echo yes
37	fi
38	if test "$enable_threads" != "no"; then
39	GTK_LIBS=`pkg-config --libs gtk+-2.0 gthread-2.0 2> /dev/null`
40	else
41	GTK_LIBS=`pkg-config --libs gtk+-2.0 2> /dev/null`
42	fi
43	CFLAGS="${CFLAGS} ${GTK_CFLAGS}"
44	LIBS="${LIBS} ${GTK_LIBS}"
45	AC_DEFINE(USE_GTK2)
46	else
47	if test "x$enable_gtk_v2" != "xno"; then
48	echo no
49	fi
50	AM_PATH_GTK(1.2.0, ,
51	AC_MSG_WARN(Cannot find GTK: Is gtk-config in path?),
52	gthread)
53	dnl AC_MSG_ERROR(Cannot find GTK: Is gtk-config in path?), gthread)
54
55	if test "x${GTK_CFLAGS}" = 'x'; then
56	echo "*** gtk-config not found, running scripts/my-gtk-config"
57	CFLAGS="${CFLAGS} `scripts/my-gtk-config --cflags`"
58	echo "*** CFLAGS now '${CFLAGS}'"
59	LIBS="${LIBS} `scripts/my-gtk-config --libs`"
60	echo "*** LIBS now '${LIBS}'"
61	fi
62
63	if test "$gdk_pixbuf" = yes; then
64	AC_PATH_PROG(gdkpixbufpath, gdk-pixbuf-config)
65	AC_MSG_CHECKING(for gdk-pixbuf >= 0.8)
66	GDK_PIXBUF_CFLAGS=`$gdkpixbufpath --cflags 2>/dev/null`
67	GDK_PIXBUF_LIBS=`$gdkpixbufpath --libs 2>/dev/null`
68	if test "_$GDK_PIXBUF_CFLAGS" = _; then
69	AC_MSG_RESULT([not found, will attempt to use 'convert' for images])
70	else
71	vers=`$gdkpixbufpath --version`
72	case $vers
73	in
74	gdk-pixbuf-0.[[01234567]]) gdk_pixbuf_ok=false ;;
75	*) gdk_pixbuf_ok=true ;;
76	esac
77	if $gdk_pixbuf_ok; then
78	AC_MSG_RESULT(found)
79	gdk_pixbuf=yes
80	AC_DEFINE(USE_GDK_PIXBUF)
81	LIBS="${LIBS} $GDK_PIXBUF_LIBS"
82	CFLAGS="${CFLAGS} $GDK_PIXBUF_CFLAGS"
83	else
84	gdk_pixbuf=no
85	AC_MSG_RESULT([version too old, building without gdk-pixbuf])
86	fi
87	fi
88	fi
89	fi	89	fi
90		90
91	ac_system=`uname -s \| cut -c1-6`	91	ac_system=`uname -s \| cut -c1-6`
Lines 93-130 Link Here
93	CFLAGS="${CFLAGS} -fnative-struct"	93	CFLAGS="${CFLAGS} -fnative-struct"
94	fi	94	fi
95		95
96		96	dnl Not needed really?
97	AC_CHECK_LIB( c_r, pthread_create, LIBS="$LIBS -lc_r", )	97	AC_CHECK_LIB( c_r, pthread_create, LIBS="$LIBS -lc_r", )
98		98
		99	dnl check for jasper here
		100	AC_CHECK_LIB(jasper, jas_init, [JASPER_LIBS="-ljasper"], [
		101	AC_MSG_ERROR(cannot find jasper library)])
		102	AC_SUBST(JASPER_LIBS)
		103
		104	# check for libccvt
		105	# libccvt is a part of the camserv project but is not automatically
		106	# installed. You will need to manually copy libccvt.a to /usr/lib and
		107	# ccvt.h to /usr/include or something similar.
		108	AC_CHECK_HEADER(ccvt.h)
		109	AC_CHECK_LIB(ccvt, ccvt_420p_rgb24)
		110
99	dnl Set PACKAGE_DATA_DIR in config.h.	111	dnl Set PACKAGE_DATA_DIR in config.h.
100	if test "x${datadir}" = 'x${prefix}/share'; then	112	dnl if test "x${datadir}" = 'x${prefix}/share'; then
101	if test "x${prefix}" = "xNONE"; then	113	dnl if test "x${prefix}" = "xNONE"; then
102	AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${ac_default_prefix}/share/${PACKAGE}")	114	dnl AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${ac_default_prefix}/share/${PACKAGE}", [])
103	else	115	dnl else
104	AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}")	116	dnl AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [])
105	fi	117	dnl fi
106	else	118	dnl else
107	AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}/${PACKAGE}")	119	dnl AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}/${PACKAGE}", [])
108	fi	120	dnl fi
		121
		122	dnl set EXPANDED_DATADIR in config.h
		123	DATADIR_TMP="$datadir"
		124	EXPANDED_DATADIR=`eval echo $DATADIR_TMP`
		125	AC_SUBST(EXPANDED_DATADIR)
		126	AC_DEFINE_UNQUOTED([EXPANDED_DATADIR],"$EXPANDED_DATADIR", [Default data dir])
		127
		128	dnl set EXPANDED_LIBEXECDIR in config.h
		129	LIBEXECDIR_TMP="$libexecdir"
		130	EXPANDED_LIBEXECDIR=`eval echo $LIBEXECDIR_TMP`
		131	AC_SUBST(EXPANDED_LIBEXECDIR)
		132	AC_DEFINE_UNQUOTED([EXPANDED_LIBEXECDIR],"$EXPANDED_LIBEXECDIR", [Location for the webcam binaries])
		133
		134	PACKAGE_DATA_DIR_TMP="$datadir/${PACKAGE}"
		135	PACKAGE_DATA_DIR=`eval echo $PACKAGE_DATA_DIR_TMP`
		136	AC_SUBST(PACKAGE_DATA_DIR)
		137	AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR,"$PACKAGE_DATA_DIR", [Location for package data])
109		138
110	dnl Set PACKAGE_SOURCE_DIR in config.h.	139	dnl Set PACKAGE_SOURCE_DIR in config.h.
111	packagesrcdir=`cd $srcdir && pwd`	140	packagesrcdir=`cd $srcdir && pwd`
112	AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}")	141	AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}", [Location for sources])
113		142
114	if test "$enable_pixmaps" != "no"; then	143	if test "$enable_pixmaps" != "no"; then
115	AC_DEFINE(SHOW_STATUS_PIXMAPS)	144	AC_DEFINE(SHOW_STATUS_PIXMAPS, [], [Enable status pixmaps])
116	else	145	else
117	echo "*** status pixmaps disabled"	146	echo "*** status pixmaps disabled"
118	fi	147	fi
119		148
120	if test "$enable_threads" != "no"; then	149	if test "$enable_threads" != "no"; then
121	AC_DEFINE(USE_PTHREAD_CREATE)	150	AC_DEFINE(USE_PTHREAD_CREATE, [], [Enable pthread_create])
122	else	151	else
123	echo "*** pthread_create disabled"	152	echo "*** pthread_create disabled"
124	fi	153	fi
125		154
126	if test "x$enable_debug" != "x"; then	155	if test "x$enable_debug" != "x"; then
127	AC_DEFINE_UNQUOTED(DBG_LEVEL, $enable_debug )	156	AC_DEFINE_UNQUOTED(DBG_LEVEL, $enable_debug, [Set debug level] )
128	echo "*** DBG_LEVEL set to ${enable_debug}"	157	echo "*** DBG_LEVEL set to ${enable_debug}"
129	else	158	else
130	AC_DEFINE(DBG_LEVEL, 0 )	159	AC_DEFINE(DBG_LEVEL, 0 )
Lines 132-145 Link Here
132		161
133	if test "x$enable_interface" != "x"; then	162	if test "x$enable_interface" != "x"; then
134	if test "x$enable_interface" = "xxtext"; then	163	if test "x$enable_interface" = "xxtext"; then
135	AC_DEFINE(GYACH_INT_XTEXT)	164	AC_DEFINE(GYACH_INT_XTEXT, [],
		165	[text interface set to gtk_xtext widget])
136	echo "*** gyach text interface set to gtk_xtext widget"	166	echo "*** gyach text interface set to gtk_xtext widget"
137	else	167	else
138	if test "x$enable_interface" = "xhtml"; then	168	if test "x$enable_interface" = "xhtml"; then
139	AC_DEFINE(GYACH_INT_HTML)	169	AC_DEFINE(GYACH_INT_HTML, [],
		170	[text interface set to gtk_html widget])
140	echo "*** gyach text interface set to gtk_html widget"	171	echo "*** gyach text interface set to gtk_html widget"
141	else	172	else
142	AC_DEFINE(GYACH_INT_TEXT)	173	AC_DEFINE(GYACH_INT_TEXT, [],
		174	[text interface set to gtk_text widget])
143	echo "*** gyach text interface set to gtk_text widget"	175	echo "*** gyach text interface set to gtk_text widget"
144	fi	176	fi
145	fi	177	fi
Lines 158-165 Link Here
158	fi	190	fi
159	changequote([,])dnl	191	changequote([,])dnl
160		192
161	AC_OUTPUT([	193	prefix=$old_prefix
		194	exec_prefix=$old_exec_prefix
		195
		196	AC_CONFIG_FILES([
162	Makefile	197	Makefile
163	src/Makefile	198	src/Makefile
		199	src/webcam/Makefile
164	])	200	])
		201	AC_OUTPUT
165		202

Lines 1-11 Link Here

(-)1.0.7.orig/gyach/src/Makefile.am (-6 / +37 lines)
1	## Process this file with automake to produce Makefile.in	1	## Process this file with automake to produce Makefile.in
2		2
		3	SUBDIRS = webcam
		4
3	INCLUDES = \	5	INCLUDES = \
4	@GTK_CFLAGS@	6	@GTHREAD_CFLAGS@ \
		7	@GTKHTML_CFLAGS@ \
		8	@ESOUND_CFLAGS@ \
		9	-DLOCALEDIR=\"$(localedir)\"
5		10
6	bin_PROGRAMS = gyach	11	bin_PROGRAMS = gyache
7		12
8	gyach_SOURCES = \	13	gyache_SOURCES = \
9	aliases.c aliases.h \	14	aliases.c aliases.h \
10	callbacks.c callbacks.h \	15	callbacks.c callbacks.h \
11	commands.c commands.h \	16	commands.c commands.h \
Lines 23-30 Link Here
23	roomlist.c roomlist.h \	28	roomlist.c roomlist.h \
24	users.c users.h \	29	users.c users.h \
25	util.c util.h \	30	util.c util.h \
26	yahoochat.c yahoochat.h	31	bootprevent.c bootprevent.h \
27		32	yahoochat.c yahoochat.h \
		33	ycht.c ycht.h \
		34	profname.c profname.h \
		35	packet_handler.c packet_handler.h \
		36	animations.c animations.h \
		37	conference.c conference.h \
		38	sounds.c sounds.h \
		39	fonts.c fonts.h \
		40	plugin_api.h \
		41	plugins.c plugins.h \
		42	prflang.c prflang.h \
		43	voice_chat.c \
		44	gytreeview.c gytreeview.h \
		45	webconnect.c webconnect.h \
		46	spamcheck.c \
		47	pmwindow.c \
		48	setupwindow2.c \
		49	fader.c \
		50	htmlrender.c \
		51	tuxvironments.c \
		52	yab.c \
		53	webcam.c webcam.h \
		54	trayicon.c trayicon.h \
		55	yahoo_sha.c yahoo_authenticate.h \
		56	sha.c sha.h \
		57	yahoo_fn.c yahoo_fn.h \
		58	roomui.c
28		59
29	gyach_LDADD = @GTK_LIBS@	60	gyache_LDADD = @GTHREAD_LIBS@ @GTKHTML_LIBS@ @ESOUND_LIBS@ @LIBLTDL@
30		61

Lines 3931-3937 Link Here

(-)1.0.7.orig/gyach/src/callbacks.c (-1 / +1 lines)
3931		3931
3932		3932
3933	void on_launch_py_voice(GtkMenuItem *widget, gpointer user_data) {	3933	void on_launch_py_voice(GtkMenuItem *widget, gpointer user_data) {
3934	snprintf(callbackbuf,300, "%s/pyvoice/pyvoiceui.py &",PACKAGE_DATA_DIR);	3934	snprintf(callbackbuf,300, EXPANDED_LIBEXECDIR "/pyvoiceui.py &");
3935	my_system(callbackbuf);	3935	my_system(callbackbuf);
3936	}	3936	}
3937		3937




libexec_PROGRAMS = gyache-webcam gyache-upload
libexec_SCRIPTS = pywebcam.py

gyache_webcam_SOURCES = main.c gyachewebcam.c gyacheupload.h gyachewebcam.h
gyache_upload_SOURCES = gyacheupload-main.c gyacheupload-v4l.c gyacheupload-ui.c ../gytreeview.c ../gytreeview.h gyachewebcam.h

gyache_webcam_LDADD = @GTK_LIBS@ @JASPER_LIBS@
gyache_upload_LDADD = @GTK_LIBS@ @JASPER_LIBS@

EXTRA_SCRIPTS = pywebcam.py
EXTRA_DIST = pywebcam.py

INCLUDES = $(DEPS_CFLAGS) -DLOCALEDIR=\"$(localedir)\" @GTKHTML_CFLAGS@ -I../
#LIBS = $(DEPS_LIBS)

Lines 48-54 Link Here

(-)1.0.7.orig/gyach/src/webcam/gyacheupload-ui.c (-1 / +1 lines)
48	*/	48	*/
49		49
50	# include "gyacheupload.h"	50	# include "gyacheupload.h"
51	#include "gytreeview.h"	51	#include "../gytreeview.h"
52	# include <jasper/jasper.h>	52	# include <jasper/jasper.h>
53		53
54	#define yahoo_put32(buf, data) ( \	54	#define yahoo_put32(buf, data) ( \




			launcher=malloc(256);
			if (!launcher) {return ;}

			snprintf(launcher,254,  EXPANDED_LIBEXECDIR "/gyache-upload"); 

			if ( stat( launcher, &sbuf ))  {
				char wmsg[304];

			launcher=malloc(10642);
			if (!launcher) { free(myfriends); return ;}

			snprintf(launcher,10640, EXPANDED_LIBEXECDIR "/gyache-upload \"%s\" \"%s\" \"%s\"  \"%s\" &",
			get_default_profile_name(), key, webcam_device , myfriends
			); 

			my_system(launcher);


			/* C-based cam viewer */
		if (! launchertype) { 
		snprintf(launcher,250, EXPANDED_LIBEXECDIR "/gyache-webcam"); 
									} else {   /* Python-based viewer */
		snprintf(launcher,250, EXPANDED_LIBEXECDIR "/pywebcam.py"); 
											  }

		if ( stat( launcher, &sbuf ))  {



		if (! launchertype) {  /* C-based viewer */
		snprintf(launcher,382, EXPANDED_LIBEXECDIR "/gyache-webcam \"%s\" \"%s\" \"%s\" &",
		lastcamwho, get_default_profile_name(), key
		); 
									} else { /* Python-based viewer */
		snprintf(launcher,382, "python " EXPANDED_LIBEXECDIR "/pywebcam.py \"%s\" \"%s\" \"%s\" &",
		lastcamwho, get_default_profile_name(), key
		); 
											 }


Return to bug 76127

Line 0 Link Here

(-)1.0.7.orig/gyach/src/webcam/Makefile.am (+14 lines)
	1	libexec_PROGRAMS = gyache-webcam gyache-upload
	2	libexec_SCRIPTS = pywebcam.py
	3
	4	gyache_webcam_SOURCES = main.c gyachewebcam.c gyacheupload.h gyachewebcam.h
	5	gyache_upload_SOURCES = gyacheupload-main.c gyacheupload-v4l.c gyacheupload-ui.c ../gytreeview.c ../gytreeview.h gyachewebcam.h
	6
	7	gyache_webcam_LDADD = @GTK_LIBS@ @JASPER_LIBS@
	8	gyache_upload_LDADD = @GTK_LIBS@ @JASPER_LIBS@
	9
	10	EXTRA_SCRIPTS = pywebcam.py
	11	EXTRA_DIST = pywebcam.py
	12
	13	INCLUDES = $(DEPS_CFLAGS) -DLOCALEDIR=\"$(localedir)\" @GTKHTML_CFLAGS@ -I../
	14	#LIBS = $(DEPS_LIBS)

Lines 98-104 Link Here

(-)1.0.7.orig/gyach/src/webcam.c (-9 / +9 lines)
98	launcher=malloc(256);	98	launcher=malloc(256);
99	if (!launcher) {return ;}	99	if (!launcher) {return ;}
100		100
101	snprintf(launcher,254, "%s/webcam/gyache-upload", PACKAGE_DATA_DIR);	101	snprintf(launcher,254, EXPANDED_LIBEXECDIR "/gyache-upload");
102		102
103	if ( stat( launcher, &sbuf )) {	103	if ( stat( launcher, &sbuf )) {
104	char wmsg[304];	104	char wmsg[304];
Lines 118-125 Link Here
118	launcher=malloc(10642);	118	launcher=malloc(10642);
119	if (!launcher) { free(myfriends); return ;}	119	if (!launcher) { free(myfriends); return ;}
120		120
121	snprintf(launcher,10640, "%s/webcam/gyache-upload \"%s\" \"%s\" \"%s\" \"%s\" &",	121	snprintf(launcher,10640, EXPANDED_LIBEXECDIR "/gyache-upload \"%s\" \"%s\" \"%s\" \"%s\" &",
122	PACKAGE_DATA_DIR, get_default_profile_name(), key, webcam_device , myfriends	122	get_default_profile_name(), key, webcam_device , myfriends
123	);	123	);
124		124
125	my_system(launcher);	125	my_system(launcher);
Lines 143-151 Link Here
143		143
144	/* C-based cam viewer */	144	/* C-based cam viewer */
145	if (! launchertype) {	145	if (! launchertype) {
146	snprintf(launcher,250, "%s/webcam/gyache-webcam", PACKAGE_DATA_DIR);	146	snprintf(launcher,250, EXPANDED_LIBEXECDIR "/gyache-webcam");
147	} else { /* Python-based viewer */	147	} else { /* Python-based viewer */
148	snprintf(launcher,250, "%s/webcam/pywebcam.py", PACKAGE_DATA_DIR);	148	snprintf(launcher,250, EXPANDED_LIBEXECDIR "/pywebcam.py");
149	}	149	}
150		150
151	if ( stat( launcher, &sbuf )) {	151	if ( stat( launcher, &sbuf )) {
Lines 157-168 Link Here
157		157
158		158
159	if (! launchertype) { /* C-based viewer */	159	if (! launchertype) { /* C-based viewer */
160	snprintf(launcher,382, "%s/webcam/gyache-webcam \"%s\" \"%s\" \"%s\" &",	160	snprintf(launcher,382, EXPANDED_LIBEXECDIR "/gyache-webcam \"%s\" \"%s\" \"%s\" &",
161	PACKAGE_DATA_DIR, lastcamwho, get_default_profile_name(), key	161	lastcamwho, get_default_profile_name(), key
162	);	162	);
163	} else { /* Python-based viewer */	163	} else { /* Python-based viewer */
164	snprintf(launcher,382, "python %s/webcam/pywebcam.py \"%s\" \"%s\" \"%s\" &",	164	snprintf(launcher,382, "python " EXPANDED_LIBEXECDIR "/pywebcam.py \"%s\" \"%s\" \"%s\" &",
165	PACKAGE_DATA_DIR, lastcamwho, get_default_profile_name(), key	165	lastcamwho, get_default_profile_name(), key
166	);	166	);
167	}	167	}
168		168