Merge lp:~darkxst/ubuntu/saucy/gnome-panel/lp1184812 into lp:ubuntu/saucy/gnome-panel

[Tim Lunn]

[Jeremy Bícha (jbicha)]

Thanks. I've uploaded this along with https://git.gnome.org/browse/gnome-panel/commit/?id=f555042

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-12-18 13:23:10 +0000
+++ debian/changelog	2013-05-28 10:11:50 +0000
@@ -1,3 +1,10 @@
+gnome-panel (1:3.6.2-0ubuntu4) saucy; urgency=low
+
+  * Rebuild for gnome-desktop 3.8 transition (LP: #1184812)
+    - debian/patches/git_panel_run_dialog_resurrect_terminal.patch 
+      clock_applet_needs_terminal.patch
+ -- Tim Lunn <[e-mail]>  Tue, 28 May 2013 11:55:23 +1000
+
 gnome-panel (1:3.6.2-0ubuntu3) raring; urgency=low
 
   [ Alberts Muktupāvels ]

=== added file 'debian/patches/clock_applet_needs_terminal.patch'
--- debian/patches/clock_applet_needs_terminal.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/clock_applet_needs_terminal.patch	2013-05-28 10:11:50 +0000
@@ -0,0 +1,358 @@
+This patches over  git_panel_run_dialog_resurrect_terminal.patch and provides a common
+function since this applet also needs the prepend_terminal command.
+
+
+--- a/applets/clock/calendar-window.c
++++ b/applets/clock/calendar-window.c
+@@ -43,7 +43,8 @@
+ #include <gio/gio.h>
+ 
+ #define GNOME_DESKTOP_USE_UNSTABLE_API
+-#include <libgnome-desktop/gnome-desktop-utils.h>
++
++#include "panel-launch.h"
+ 
+ #include "calendar-window.h"
+ 
+@@ -190,7 +191,7 @@
+ 	error = NULL;
+ 
+ 	if (terminal)
+-		gnome_desktop_prepend_terminal_to_vector (&argc, &argv);
++		panel_util_desktop_prepend_terminal_to_vector (&argc, &argv);
+ 
+ 	display = gdk_screen_make_display_name (screen);
+ 
+--- a/gnome-panel/panel-run-dialog.c
++++ b/gnome-panel/panel-run-dialog.c
+@@ -47,6 +47,7 @@
+ #include <libpanel-util/panel-glib.h>
+ #include <libpanel-util/panel-gtk.h>
+ #include <libpanel-util/panel-keyfile.h>
++#include <libpanel-util/panel-launch.h>
+ #include <libpanel-util/panel-show.h>
+ #include <libpanel-util/panel-xdg.h>
+ 
+@@ -335,136 +336,6 @@
+ }
+ 
+ 
+-/**
+- * gnome_desktop_prepend_terminal_to_vector:
+- * @argc: a pointer to the vector size
+- * @argv: a pointer to the vector
+- *
+- * Description:  Prepends a terminal (either the one configured as default in
+- * the user's GNOME setup, or one of the common xterm emulators) to the passed
+- * in vector, modifying it in the process.  The vector should be allocated with
+- * #g_malloc, as this will #g_free the original vector.  Also all elements must
+- * have been allocated separately.  That is the standard glib/GNOME way of
+- * doing vectors however.  If the integer that @argc points to is negative, the
+- * size will first be computed.  Also note that passing in pointers to a vector
+- * that is empty, will just create a new vector for you.
+- **/
+-static void
+-gnome_desktop_prepend_terminal_to_vector (int *argc, char ***argv)
+-{
+-#ifndef G_OS_WIN32
+-        char **real_argv;
+-        int real_argc;
+-        int i, j;
+-	char **term_argv = NULL;
+-	int term_argc = 0;
+-	GSettings *settings;
+-
+-	gchar *terminal = NULL;
+-
+-	char **the_argv;
+-
+-        g_return_if_fail (argc != NULL);
+-        g_return_if_fail (argv != NULL);
+-
+-        // _gnome_desktop_init_i18n ();
+-
+-	/* sanity */
+-        if(*argv == NULL)
+-                *argc = 0;
+-
+-	the_argv = *argv;
+-
+-	/* compute size if not given */
+-	if (*argc < 0) {
+-		for (i = 0; the_argv[i] != NULL; i++)
+-			;
+-		*argc = i;
+-	}
+-
+-	settings = g_settings_new ("org.gnome.desktop.default-applications.terminal");
+-	terminal = g_settings_get_string (settings, "exec");
+-
+-	if (terminal) {
+-		gchar *command_line;
+-		gchar *exec_flag;
+-
+-		exec_flag = g_settings_get_string (settings, "exec-arg");
+-
+-		if (exec_flag == NULL)
+-			command_line = g_strdup (terminal);
+-		else
+-			command_line = g_strdup_printf ("%s %s", terminal,
+-							exec_flag);
+-
+-		g_shell_parse_argv (command_line,
+-				    &term_argc,
+-				    &term_argv,
+-				    NULL /* error */);
+-
+-		g_free (command_line);
+-		g_free (exec_flag);
+-		g_free (terminal);
+-	}
+-
+-	g_object_unref (settings);
+-
+-	if (term_argv == NULL) {
+-		char *check;
+-
+-		term_argc = 2;
+-		term_argv = g_new0 (char *, 3);
+-
+-		check = g_find_program_in_path ("gnome-terminal");
+-		if (check != NULL) {
+-			term_argv[0] = check;
+-			/* Note that gnome-terminal takes -x and
+-			 * as -e in gnome-terminal is broken we use that. */
+-			term_argv[1] = g_strdup ("-x");
+-		} else {
+-			if (check == NULL)
+-				check = g_find_program_in_path ("nxterm");
+-			if (check == NULL)
+-				check = g_find_program_in_path ("color-xterm");
+-			if (check == NULL)
+-				check = g_find_program_in_path ("rxvt");
+-			if (check == NULL)
+-				check = g_find_program_in_path ("xterm");
+-			if (check == NULL)
+-				check = g_find_program_in_path ("dtterm");
+-			if (check == NULL) {
+-				g_warning (_("Cannot find a terminal, using "
+-					     "xterm, even if it may not work"));
+-				check = g_strdup ("xterm");
+-			}
+-			term_argv[0] = check;
+-			term_argv[1] = g_strdup ("-e");
+-		}
+-	}
+-
+-        real_argc = term_argc + *argc;
+-        real_argv = g_new (char *, real_argc + 1);
+-
+-        for (i = 0; i < term_argc; i++)
+-                real_argv[i] = term_argv[i];
+-
+-        for (j = 0; j < *argc; j++, i++)
+-                real_argv[i] = (char *)the_argv[j];
+-
+-	real_argv[i] = NULL;
+-
+-	g_free (*argv);
+-	*argv = real_argv;
+-	*argc = real_argc;
+-
+-	/* we use g_free here as we sucked all the inner strings
+-	 * out from it into real_argv */
+-	g_free (term_argv);
+-#else
+-	/* FIXME: Implement when needed */
+-	g_warning ("gnome_prepend_terminal_to_vector: Not implemented");
+-#endif
+-}
+ 
+ static gboolean
+ panel_run_dialog_launch_command (PanelRunDialog *dialog,
+@@ -485,7 +356,7 @@
+ 	screen = gtk_window_get_screen (GTK_WINDOW (dialog->run_dialog));
+ 
+ 	if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog->terminal_checkbox)))
+-		gnome_desktop_prepend_terminal_to_vector (&argc, &argv);
++		panel_util_desktop_prepend_terminal_to_vector (&argc, &argv);
+ 
+ 	display = gdk_screen_make_display_name (screen);
+ 
+--- a/gnome-panel/libpanel-util/panel-launch.c
++++ b/gnome-panel/libpanel-util/panel-launch.c
+@@ -280,3 +280,135 @@
+ 	return _panel_launch_handle_error (fallback_exec,
+ 					   screen, local_error, error);
+ }
++
++/**
++ * panel_util_desktop_prepend_terminal_to_vector:
++ * @argc: a pointer to the vector size
++ * @argv: a pointer to the vector
++ *
++ * Description:  Prepends a terminal (either the one configured as default in
++ * the user's GNOME setup, or one of the common xterm emulators) to the passed
++ * in vector, modifying it in the process.  The vector should be allocated with
++ * #g_malloc, as this will #g_free the original vector.  Also all elements must
++ * have been allocated separately.  That is the standard glib/GNOME way of
++ * doing vectors however.  If the integer that @argc points to is negative, the
++ * size will first be computed.  Also note that passing in pointers to a vector
++ * that is empty, will just create a new vector for you.
++ **/
++void
++panel_util_desktop_prepend_terminal_to_vector (int *argc, char ***argv)
++{
++#ifndef G_OS_WIN32
++        char **real_argv;
++        int real_argc;
++        int i, j;
++	char **term_argv = NULL;
++	int term_argc = 0;
++	GSettings *settings;
++
++	gchar *terminal = NULL;
++
++	char **the_argv;
++
++        g_return_if_fail (argc != NULL);
++        g_return_if_fail (argv != NULL);
++
++        // _gnome_desktop_init_i18n ();
++
++	/* sanity */
++        if(*argv == NULL)
++                *argc = 0;
++
++	the_argv = *argv;
++
++	/* compute size if not given */
++	if (*argc < 0) {
++		for (i = 0; the_argv[i] != NULL; i++)
++			;
++		*argc = i;
++	}
++
++	settings = g_settings_new ("org.gnome.desktop.default-applications.terminal");
++	terminal = g_settings_get_string (settings, "exec");
++
++	if (terminal) {
++		gchar *command_line;
++		gchar *exec_flag;
++
++		exec_flag = g_settings_get_string (settings, "exec-arg");
++
++		if (exec_flag == NULL)
++			command_line = g_strdup (terminal);
++		else
++			command_line = g_strdup_printf ("%s %s", terminal,
++							exec_flag);
++
++		g_shell_parse_argv (command_line,
++				    &term_argc,
++				    &term_argv,
++				    NULL /* error */);
++
++		g_free (command_line);
++		g_free (exec_flag);
++		g_free (terminal);
++	}
++
++	g_object_unref (settings);
++
++	if (term_argv == NULL) {
++		char *check;
++
++		term_argc = 2;
++		term_argv = g_new0 (char *, 3);
++
++		check = g_find_program_in_path ("gnome-terminal");
++		if (check != NULL) {
++			term_argv[0] = check;
++			/* Note that gnome-terminal takes -x and
++			 * as -e in gnome-terminal is broken we use that. */
++			term_argv[1] = g_strdup ("-x");
++		} else {
++			if (check == NULL)
++				check = g_find_program_in_path ("nxterm");
++			if (check == NULL)
++				check = g_find_program_in_path ("color-xterm");
++			if (check == NULL)
++				check = g_find_program_in_path ("rxvt");
++			if (check == NULL)
++				check = g_find_program_in_path ("xterm");
++			if (check == NULL)
++				check = g_find_program_in_path ("dtterm");
++			if (check == NULL) {
++				g_warning (_("Cannot find a terminal, using "
++					     "xterm, even if it may not work"));
++				check = g_strdup ("xterm");
++			}
++			term_argv[0] = check;
++			term_argv[1] = g_strdup ("-e");
++		}
++	}
++
++        real_argc = term_argc + *argc;
++        real_argv = g_new (char *, real_argc + 1);
++
++        for (i = 0; i < term_argc; i++)
++                real_argv[i] = term_argv[i];
++
++        for (j = 0; j < *argc; j++, i++)
++                real_argv[i] = (char *)the_argv[j];
++
++	real_argv[i] = NULL;
++
++	g_free (*argv);
++	*argv = real_argv;
++	*argc = real_argc;
++
++	/* we use g_free here as we sucked all the inner strings
++	 * out from it into real_argv */
++	g_free (term_argv);
++#else
++	/* FIXME: Implement when needed */
++	g_warning ("gnome_prepend_terminal_to_vector: Not implemented");
++#endif
++}
++
+--- a/gnome-panel/libpanel-util/panel-launch.h
++++ b/gnome-panel/libpanel-util/panel-launch.h
+@@ -56,6 +56,8 @@
+ 						  GdkScreen   *screen,
+ 						  GError     **error);
+ 
++void panel_util_desktop_prepend_terminal_to_vector (int *argc, char ***argv);
++
+ G_END_DECLS
+ 
+ #endif /* PANEL_LAUNCH_H */
+--- a/applets/clock/Makefile.am
++++ b/applets/clock/Makefile.am
+@@ -52,12 +52,14 @@
+ 	$(CLOCK_EDS_CFLAGS)					\
+ 	-I$(srcdir)/../../libpanel-applet			\
+ 	-I$(top_builddir)/libpanel-applet			\
++    -I$(top_builddir)/gnome-panel/libpanel-util			\
+ 	-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"	\
+ 	-DCLOCK_EDS_ICONDIR="\"$(CLOCK_EDS_ICONDIR)\""		\
+ 	-DGWEATHER_I_KNOW_THIS_IS_UNSTABLE
+ 
+ CLOCK_LDADD =						\
+ 	../../libpanel-applet/libpanel-applet-4.la	\
++    ../../gnome-panel/libpanel-util/libpanel-util.la \
+ 	$(CLOCK_LIBS)					\
+ 	$(CLOCK_EDS_LIBS)					\
+ 	$(LIBPANEL_APPLET_LIBS)				\
+--- a/configure.ac
++++ b/configure.ac
+@@ -131,7 +131,7 @@
+ AC_SUBST(TZ_CFLAGS)
+ AC_SUBST(TZ_LIBS)
+ 
+-PKG_CHECK_MODULES(CLOCK, pango >= $PANGO_REQUIRED gtk+-3.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED librsvg-2.0 gweather-3.0 >= $GWEATHER_REQUIRED gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED)
++PKG_CHECK_MODULES(CLOCK, pango >= $PANGO_REQUIRED gtk+-3.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED librsvg-2.0 gweather-3.0 >= $GWEATHER_REQUIRED gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED dconf >= $DCONF_REQUIRED)
+ AC_SUBST(CLOCK_CFLAGS)
+ AC_SUBST(CLOCK_LIBS)
+ 

=== added file 'debian/patches/git_panel_run_dialog_resurrect_terminal.patch'
--- debian/patches/git_panel_run_dialog_resurrect_terminal.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/git_panel_run_dialog_resurrect_terminal.patch	2013-05-28 10:11:50 +0000
@@ -0,0 +1,173 @@
+From bf6af945130299a69a244afaee4eecbd3fb77233 Mon Sep 17 00:00:00 2001
+From: Philipp Kaluza <[e-mail]>
+Date: Fri, 08 Mar 2013 17:08:32 +0000
+Subject: panel-run-dialog: resurrect function gnome_desktop_prepend_terminal_to_vector
+
+, which was removed from gnome-desktop in commit
+9bab2144b7c8ace0c057720be3c48fb24a80a19d , and keep a local
+copy in panel-run-dialog.c (simple helper function, static).
+(Second half of fix for bug #237308 .)
+---
+diff --git a/gnome-panel/panel-run-dialog.c b/gnome-panel/panel-run-dialog.c
+index 801b9bc..faf3d7e 100644
+--- a/gnome-panel/panel-run-dialog.c
++++ b/gnome-panel/panel-run-dialog.c
+@@ -25,6 +25,7 @@
+  *	Havoc Pennington <[e-mail]>
+  *      George Lebl <[e-mail]>
+  *	Mark McLoughlin <[e-mail]>
++ *	Tom Tromey (Copyright (C) 1998)
+  */
+ 
+ #include <config.h>
+@@ -42,8 +43,6 @@
+ #include <gdk/gdkkeysyms.h>
+ #include <gmenu-tree.h>
+ 
+-#include <libgnome-desktop/gnome-desktop-utils.h>
+-
+ #include <libpanel-util/panel-error.h>
+ #include <libpanel-util/panel-glib.h>
+ #include <libpanel-util/panel-gtk.h>
+@@ -335,6 +334,138 @@ dummy_child_watch (GPid         pid,
+ 	 */
+ }
+ 
++
++/**
++ * gnome_desktop_prepend_terminal_to_vector:
++ * @argc: a pointer to the vector size
++ * @argv: a pointer to the vector
++ *
++ * Description:  Prepends a terminal (either the one configured as default in
++ * the user's GNOME setup, or one of the common xterm emulators) to the passed
++ * in vector, modifying it in the process.  The vector should be allocated with
++ * #g_malloc, as this will #g_free the original vector.  Also all elements must
++ * have been allocated separately.  That is the standard glib/GNOME way of
++ * doing vectors however.  If the integer that @argc points to is negative, the
++ * size will first be computed.  Also note that passing in pointers to a vector
++ * that is empty, will just create a new vector for you.
++ **/
++static void
++gnome_desktop_prepend_terminal_to_vector (int *argc, char ***argv)
++{
++#ifndef G_OS_WIN32
++        char **real_argv;
++        int real_argc;
++        int i, j;
++	char **term_argv = NULL;
++	int term_argc = 0;
++	GSettings *settings;
++
++	gchar *terminal = NULL;
++
++	char **the_argv;
++
++        g_return_if_fail (argc != NULL);
++        g_return_if_fail (argv != NULL);
++
++        // _gnome_desktop_init_i18n ();
++
++	/* sanity */
++        if(*argv == NULL)
++                *argc = 0;
++
++	the_argv = *argv;
++
++	/* compute size if not given */
++	if (*argc < 0) {
++		for (i = 0; the_argv[i] != NULL; i++)
++			;
++		*argc = i;
++	}
++
++	settings = g_settings_new ("org.gnome.desktop.default-applications.terminal");
++	terminal = g_settings_get_string (settings, "exec");
++
++	if (terminal) {
++		gchar *command_line;
++		gchar *exec_flag;
++
++		exec_flag = g_settings_get_string (settings, "exec-arg");
++
++		if (exec_flag == NULL)
++			command_line = g_strdup (terminal);
++		else
++			command_line = g_strdup_printf ("%s %s", terminal,
++							exec_flag);
++
++		g_shell_parse_argv (command_line,
++				    &term_argc,
++				    &term_argv,
++				    NULL /* error */);
++
++		g_free (command_line);
++		g_free (exec_flag);
++		g_free (terminal);
++	}
++
++	g_object_unref (settings);
++
++	if (term_argv == NULL) {
++		char *check;
++
++		term_argc = 2;
++		term_argv = g_new0 (char *, 3);
++
++		check = g_find_program_in_path ("gnome-terminal");
++		if (check != NULL) {
++			term_argv[0] = check;
++			/* Note that gnome-terminal takes -x and
++			 * as -e in gnome-terminal is broken we use that. */
++			term_argv[1] = g_strdup ("-x");
++		} else {
++			if (check == NULL)
++				check = g_find_program_in_path ("nxterm");
++			if (check == NULL)
++				check = g_find_program_in_path ("color-xterm");
++			if (check == NULL)
++				check = g_find_program_in_path ("rxvt");
++			if (check == NULL)
++				check = g_find_program_in_path ("xterm");
++			if (check == NULL)
++				check = g_find_program_in_path ("dtterm");
++			if (check == NULL) {
++				g_warning (_("Cannot find a terminal, using "
++					     "xterm, even if it may not work"));
++				check = g_strdup ("xterm");
++			}
++			term_argv[0] = check;
++			term_argv[1] = g_strdup ("-e");
++		}
++	}
++
++        real_argc = term_argc + *argc;
++        real_argv = g_new (char *, real_argc + 1);
++
++        for (i = 0; i < term_argc; i++)
++                real_argv[i] = term_argv[i];
++
++        for (j = 0; j < *argc; j++, i++)
++                real_argv[i] = (char *)the_argv[j];
++
++	real_argv[i] = NULL;
++
++	g_free (*argv);
++	*argv = real_argv;
++	*argc = real_argc;
++
++	/* we use g_free here as we sucked all the inner strings
++	 * out from it into real_argv */
++	g_free (term_argv);
++#else
++	/* FIXME: Implement when needed */
++	g_warning ("gnome_prepend_terminal_to_vector: Not implemented");
++#endif
++}
++
+ static gboolean
+ panel_run_dialog_launch_command (PanelRunDialog *dialog,
+ 				 const char     *command,
+--
+cgit v0.9.1
+

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-12-03 22:12:43 +0000
+++ debian/patches/series	2013-05-28 10:11:50 +0000
@@ -8,3 +8,5 @@
 85_disable_shutdown_on_ltsp.patch
 90-remove_artifact_on_icon_animation.patch
 fix-for-1083811.patch
+git_panel_run_dialog_resurrect_terminal.patch
+clock_applet_needs_terminal.patch