From: <co...@fr...> - 2005-04-04 21:32:59
|
CVS Root: /cvs/gstreamer Module: gst-sandbox Changes by: company Date: Mon Apr 04 2005 14:32:56 PDT Log message: * autogen.sh: run intltoolize * src/naked/mainwindow.c: (on_run_activate): don't break strict aliasing rules * src/naked/naked.c: (spawn_child): use correct seperator char for LD_PRELOAD Modified files: naked : ChangeLog autogen.sh naked/src/naked : mainwindow.c naked.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-sandbox/naked/ChangeLog.diff?r1=1.2&r2=1.3 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-sandbox/naked/autogen.sh.diff?r1=1.1&r2=1.2 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-sandbox/naked/src/naked/mainwindow.c.diff?r1=1.1&r2=1.2 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-sandbox/naked/src/naked/naked.c.diff?r1=1.2&r2=1.3 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-sandbox/naked/ChangeLog,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ChangeLog 4 Apr 2005 15:03:36 -0000 1.2 +++ ChangeLog 4 Apr 2005 21:32:44 -0000 1.3 @@ -1,3 +1,12 @@ +2005-04-04 Benjamin Otte <ot...@gn...> + + * autogen.sh: + run intltoolize + * src/naked/mainwindow.c: (on_run_activate): + don't break strict aliasing rules + * src/naked/naked.c: (spawn_child): + use correct seperator char for LD_PRELOAD 2005-04-04 Benjamin Otte <in...@pu...> * Makefile.am: Index: autogen.sh RCS file: /cvs/gstreamer/gst-sandbox/naked/autogen.sh,v retrieving revision 1.1 diff -u -d -r1.1 -r1.2 --- autogen.sh 2 Apr 2005 00:14:07 -0000 1.1 +++ autogen.sh 4 Apr 2005 21:32:44 -0000 1.2 @@ -6,6 +6,7 @@ srcfile=src/naked/naked.c # a quick cvs co to ease the transition +5B if test ! -d common; then if test -f CVS/Tag; then # get everything from CVS/Tag from second character on @@ -39,6 +40,8 @@ "ftp://ftp.gnu.org/pub/gnu/libtool/" 1 5 0 || DIE=1 version_check "pkg-config" "" \ "http://www.freedesktop.org/software/pkgconfig" 0 8 0 || DIE=1 +version_check "intltoolize" "" \ + "http://ftp.gnome.org/pub/gnome/sources/intltool/" 0 23 0 || DIE=1 die_check $DIE @@ -83,6 +86,7 @@ tool_run "$autoconf" debug "automake: $automake" tool_run "$automake" "--add-missing --copy" +tool_run "intltoolize" test -n "$NOCONFIGURE" && { echo "skipping configure stage for package $package, as requested." Index: mainwindow.c RCS file: /cvs/gstreamer/gst-sandbox/naked/src/naked/mainwindow.c,v --- mainwindow.c 4 Apr 2005 15:03:37 -0000 1.1 +++ mainwindow.c 4 Apr 2005 21:32:44 -0000 1.2 @@ -95,12 +95,13 @@ if (runwindow == NULL) { GladeXML *xml = glade_xml_new (GLADE_FILE_RUN, NULL, NULL); + gpointer unset = runwindow; glade_xml_signal_autoconnect(xml); runwindow = glade_xml_get_widget (xml, "rundialog"); gtk_window_set_transient_for (GTK_WINDOW (runwindow), GTK_WINDOW (window)); g_object_set_qdata_full (G_OBJECT (runwindow), _xml_quark, xml, g_object_unref); - g_object_add_weak_pointer (G_OBJECT (runwindow), (gpointer *) &runwindow); + g_object_add_weak_pointer (G_OBJECT (runwindow), &unset); } else { gtk_widget_show (runwindow); } Index: naked.c RCS file: /cvs/gstreamer/gst-sandbox/naked/src/naked/naked.c,v --- naked.c 4 Apr 2005 15:03:37 -0000 1.2 +++ naked.c 4 Apr 2005 21:32:44 -0000 1.3 @@ -39,7 +39,7 @@ for (i = 0; _envp[i] != NULL; i++) { if (g_str_has_prefix (_envp[i], "LD_PRELOAD=")) { - preload = g_strconcat ("LD_PRELOAD=", NAKED_PRELOAD_LIB, ",", &(_envp[i][11]), NULL); + preload = g_strconcat ("LD_PRELOAD=", NAKED_PRELOAD_LIB, G_SEARCHPATH_SEPARATOR_S, &(_envp[i][11]), NULL); } else if (g_str_has_prefix (_envp[i], NAKED_ADDRESS "=")) { /* skip it */ } else { |