1 From 44eba7db43b227d9b15a2d64d0af97167522891d Mon Sep 17 00:00:00 2001
2 From: Philipp Kaluza <phk@src.gnome.org>
3 Date: Fri, 8 Mar 2013 18:48:04 +0100
4 Subject: [PATCH 6/6] panel-run-dialog: rename helper function
6 that I resurrected earlier from gnome_desktop_prepend_terminal_to_vector
7 to panel_run_dialog_prepend_terminal_to_vector (use proper namespace).
9 gnome-panel/panel-run-dialog.c | 14 ++++----------
10 1 file changed, 4 insertions(+), 10 deletions(-)
12 diff --git a/gnome-panel/panel-run-dialog.c b/gnome-panel/panel-run-dialog.c
13 index faf3d7e..d89ac06 100644
14 --- a/gnome-panel/panel-run-dialog.c
15 +++ b/gnome-panel/panel-run-dialog.c
16 @@ -336,7 +336,7 @@ dummy_child_watch (GPid pid,
20 - * gnome_desktop_prepend_terminal_to_vector:
21 + * panel_run_dialog_prepend_terminal_to_vector:
22 * @argc: a pointer to the vector size
23 * @argv: a pointer to the vector
25 @@ -349,10 +349,10 @@ dummy_child_watch (GPid pid,
26 * size will first be computed. Also note that passing in pointers to a vector
27 * that is empty, will just create a new vector for you.
29 +/* TODO: throw out this function if there ever is a proper GAppInfo port */
31 -gnome_desktop_prepend_terminal_to_vector (int *argc, char ***argv)
32 +panel_run_dialog_prepend_terminal_to_vector (int *argc, char ***argv)
38 @@ -367,8 +367,6 @@ gnome_desktop_prepend_terminal_to_vector (int *argc, char ***argv)
39 g_return_if_fail (argc != NULL);
40 g_return_if_fail (argv != NULL);
42 - // _gnome_desktop_init_i18n ();
47 @@ -460,10 +458,6 @@ gnome_desktop_prepend_terminal_to_vector (int *argc, char ***argv)
48 /* we use g_free here as we sucked all the inner strings
49 * out from it into real_argv */
52 - /* FIXME: Implement when needed */
53 - g_warning ("gnome_prepend_terminal_to_vector: Not implemented");
58 @@ -485,7 +479,7 @@ panel_run_dialog_launch_command (PanelRunDialog *dialog,
59 screen = gtk_window_get_screen (GTK_WINDOW (dialog->run_dialog));
61 if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog->terminal_checkbox)))
62 - gnome_desktop_prepend_terminal_to_vector (&argc, &argv);
63 + panel_run_dialog_prepend_terminal_to_vector (&argc, &argv);
65 display = gdk_screen_make_display_name (screen);