gnome-terminal r3078 - trunk/src
- From: chpe svn gnome org
- To: svn-commits-list gnome org
- Subject: gnome-terminal r3078 - trunk/src
- Date: Wed, 24 Sep 2008 20:10:59 +0000 (UTC)
Author: chpe
Date: Wed Sep 24 20:10:59 2008
New Revision: 3078
URL: http://svn.gnome.org/viewvc/gnome-terminal?rev=3078&view=rev
Log:
Remove trailing whitespace.
Modified:
trunk/src/terminal-app.c
trunk/src/terminal.c
Modified: trunk/src/terminal-app.c
==============================================================================
--- trunk/src/terminal-app.c (original)
+++ trunk/src/terminal-app.c Wed Sep 24 20:10:59 2008
@@ -221,7 +221,7 @@
app->default_profile = profile;
g_object_notify (G_OBJECT (app), TERMINAL_APP_DEFAULT_PROFILE);
}
-
+
return profile;
}
@@ -264,7 +264,7 @@
g_warning ("Failed to recursively unset %s: %s\n", gconf_dir, error->message);
g_error_free (error);
}
-
+
g_free (gconf_dir);
}
@@ -406,7 +406,7 @@
{
GtkWidget *combo;
GtkCellRenderer *renderer;
-
+
combo = gtk_combo_box_new ();
terminal_util_set_atk_name_description (combo, NULL, _("Click button to choose profile"));
@@ -444,7 +444,7 @@
* and update_default_profile must be called in sync with those changes.
*/
app->default_profile = profile;
-
+
g_object_notify (G_OBJECT (app), TERMINAL_APP_DEFAULT_PROFILE);
g_object_unref (profile);
@@ -521,7 +521,7 @@
profile = TERMINAL_PROFILE (g_object_get_data (G_OBJECT (dialog), "profile"));
g_assert (profile != NULL);
-
+
if (response == GTK_RESPONSE_ACCEPT)
terminal_app_delete_profile (app, profile);
@@ -546,7 +546,7 @@
if (!gtk_tree_selection_get_selected (selection, NULL, &iter))
return;
-
+
gtk_tree_model_get (model, &iter, (int) COL_PROFILE, &selected_profile, (int) -1);
transient_parent = gtk_widget_get_toplevel (widget);
@@ -569,17 +569,17 @@
-1);
gtk_dialog_set_default_response (GTK_DIALOG (dialog),
GTK_RESPONSE_ACCEPT);
-
- gtk_window_set_title (GTK_WINDOW (dialog), _("Delete Profile"));
+
+ gtk_window_set_title (GTK_WINDOW (dialog), _("Delete Profile"));
gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
/* Transfer refcount of |selected_profile|, so no unref below */
g_object_set_data_full (G_OBJECT (dialog), "profile", selected_profile, g_object_unref);
-
+
g_signal_connect (dialog, "response",
G_CALLBACK (profile_list_delete_confirm_response_cb),
app);
-
+
gtk_window_present (GTK_WINDOW (dialog));
}
@@ -611,9 +611,9 @@
if (!gtk_tree_selection_get_selected (selection, NULL, &iter))
return;
-
+
gtk_tree_model_get (model, &iter, (int) COL_PROFILE, &selected_profile, (int) -1);
-
+
terminal_app_edit_profile (app, selected_profile,
GTK_WINDOW (app->manage_profiles_dialog));
g_object_unref (selected_profile);
@@ -636,9 +636,9 @@
if (!gtk_tree_model_get_iter (model, &iter, path))
return;
-
+
gtk_tree_model_get (model, &iter, (int) COL_PROFILE, &selected_profile, (int) -1);
-
+
terminal_app_edit_profile (app, selected_profile,
GTK_WINDOW (app->manage_profiles_dialog));
g_object_unref (selected_profile);
@@ -675,7 +675,7 @@
GList *profiles_to_delete, *l;
gboolean need_new_default;
TerminalProfile *fallback;
-
+
g_object_freeze_notify (object);
profiles_to_delete = terminal_app_get_profile_list (app);
@@ -685,7 +685,7 @@
val->type != GCONF_VALUE_LIST ||
gconf_value_get_list_type (val) != GCONF_VALUE_STRING)
goto ensure_one_profile;
-
+
value_list = gconf_value_get_list (val);
/* Add any new ones */
@@ -729,7 +729,7 @@
fallback = terminal_app_create_profile (app, FALLBACK_PROFILE_ID);
g_assert (fallback != NULL);
}
-
+
/* Forget no-longer-existing profiles */
need_new_default = FALSE;
for (l = profiles_to_delete; l != NULL; l = l->next)
@@ -753,7 +753,7 @@
/* |profile| possibly isn't dead yet since the profiles dialogue's tree model holds a ref too... */
}
g_list_free (profiles_to_delete);
-
+
if (need_new_default)
{
TerminalProfile *new_default;
@@ -792,10 +792,10 @@
TerminalApp *app = TERMINAL_APP (user_data);
GConfValue *val;
const char *name = NULL;
-
+
app->default_profile_locked = !gconf_entry_get_is_writable (entry);
- val = gconf_entry_get_value (entry);
+ val = gconf_entry_get_value (entry);
if (val != NULL &&
val->type == GCONF_VALUE_STRING)
name = gconf_value_get_string (val);
@@ -928,7 +928,7 @@
name_entry = g_object_get_data (G_OBJECT (new_profile_dialog), "name_entry");
name = gtk_editable_get_chars (GTK_EDITABLE (name_entry), 0, -1);
g_strstrip (name); /* name will be non empty after stripping */
-
+
profiles = terminal_app_get_profile_list (app);
for (tmp = profiles; tmp != NULL; tmp = tmp->next)
{
@@ -942,20 +942,20 @@
}
if (tmp)
{
- confirm_dialog = gtk_message_dialog_new (GTK_WINDOW (new_profile_dialog),
+ confirm_dialog = gtk_message_dialog_new (GTK_WINDOW (new_profile_dialog),
GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_QUESTION,
- GTK_BUTTONS_YES_NO,
+ GTK_MESSAGE_QUESTION,
+ GTK_BUTTONS_YES_NO,
_("You already have a profile called â%sâ. Do you want to create another profile with the same name?"), name);
retval = gtk_dialog_run (GTK_DIALOG (confirm_dialog));
gtk_widget_destroy (confirm_dialog);
- if (retval == GTK_RESPONSE_NO)
+ if (retval == GTK_RESPONSE_NO)
goto cleanup;
}
g_list_free (profiles);
transient_parent = gtk_window_get_transient_for (GTK_WINDOW (new_profile_dialog));
-
+
new_profile = _terminal_profile_clone (base_profile, name);
new_profile_name = terminal_profile_get_property_string (new_profile, TERMINAL_PROFILE_NAME);
g_hash_table_insert (app->profiles,
@@ -979,7 +979,7 @@
cleanup:
g_free (name);
}
-
+
gtk_widget_destroy (new_profile_dialog);
}
@@ -988,7 +988,7 @@
TerminalApp *app)
{
GtkWidget *combo;
-
+
combo = g_object_get_data (G_OBJECT (new_profile_dialog), "base_option_menu");
g_signal_handlers_disconnect_by_func (app, G_CALLBACK (profile_combo_box_refill), combo);
@@ -1081,13 +1081,13 @@
TerminalApp *app)
{
g_assert (app->manage_profiles_dialog == dialog);
-
+
if (id == GTK_RESPONSE_HELP)
{
terminal_util_show_help ("gnome-terminal-manage-profiles", GTK_WINDOW (dialog));
return;
}
-
+
gtk_widget_destroy (dialog);
}
@@ -1158,14 +1158,14 @@
g_signal_connect (new_button, "clicked",
G_CALLBACK (profile_list_new_button_clicked_cb),
- app->manage_profiles_list);
+ app->manage_profiles_list);
g_signal_connect (edit_button, "clicked",
G_CALLBACK (profile_list_edit_button_clicked_cb),
app->manage_profiles_list);
g_signal_connect (remove_button, "clicked",
G_CALLBACK (profile_list_delete_button_clicked_cb),
app->manage_profiles_list);
-
+
app->manage_profiles_default_menu = profile_combo_box_new (app);
g_signal_connect (app->manage_profiles_default_menu, "changed",
G_CALLBACK (profile_combo_box_changed_cb), app);
@@ -1190,7 +1190,7 @@
{
GList *lw;
GPtrArray* args;
-
+
args = g_ptr_array_new ();
g_ptr_array_add (args, g_strdup (EXECUTABLE_NAME));
@@ -1206,7 +1206,7 @@
TerminalScreen *active_screen;
active_screen = terminal_window_get_active (window);
-
+
tabs = terminal_window_list_screen_containers (window);
for (lt = tabs; lt != NULL; lt = lt->next)
@@ -1220,11 +1220,11 @@
screen = terminal_screen_container_get_screen (GTK_WIDGET (lt->data));
profile_id = terminal_profile_get_property_string (terminal_screen_get_profile (screen),
TERMINAL_PROFILE_NAME);
-
+
if (lt == tabs)
{
GdkWindowState state;
-
+
g_ptr_array_add (args, g_strdup_printf ("--window-with-profile-internal-id=%s",
profile_id));
if (terminal_window_get_menubar_visible (window))
@@ -1267,7 +1267,7 @@
char *flattened;
g_ptr_array_add (args, g_strdup ("--command"));
-
+
flattened = g_strjoinv (" ", (char**) override_command);
g_ptr_array_add (args, flattened);
}
@@ -1297,12 +1297,12 @@
char buf[G_ASCII_DTOSTR_BUF_SIZE];
g_ascii_dtostr (buf, sizeof (buf), zoom);
-
+
g_ptr_array_add (args, g_strdup ("--zoom"));
g_ptr_array_add (args, g_strdup (buf));
}
}
-
+
g_list_free (tabs);
}
@@ -1340,7 +1340,7 @@
#endif
g_strfreev (clone_command);
-
+
/* success */
return TRUE;
}
@@ -1378,7 +1378,7 @@
global_app = app;
app->profiles = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref);
-
+
app->conf = gconf_client_get_default ();
gconf_client_add_dir (app->conf, CONF_GLOBAL_PREFIX,
@@ -1387,7 +1387,7 @@
gconf_client_add_dir (app->conf, MONOSPACE_FONT_DIR,
GCONF_CLIENT_PRELOAD_ONELEVEL,
NULL);
-
+
app->profile_list_notify_id =
gconf_client_notify_add (app->conf, PROFILE_LIST_KEY,
terminal_app_profile_list_notify_cb,
@@ -1632,9 +1632,9 @@
GdkScreen *screen)
{
TerminalWindow *window;
-
+
window = terminal_window_new ();
-
+
app->windows = g_list_append (app->windows, window);
g_signal_connect (window, "destroy",
G_CALLBACK (terminal_window_destroyed), app);
Modified: trunk/src/terminal.c
==============================================================================
--- trunk/src/terminal.c (original)
+++ trunk/src/terminal.c Wed Sep 24 20:10:59 2008
@@ -172,7 +172,7 @@
char *geometry;
char *role;
-
+
} InitialWindow;
static InitialTab*
@@ -191,7 +191,7 @@
it->zoom = 1.0;
it->zoom_set = FALSE;
it->active = FALSE;
-
+
return it;
}
@@ -210,9 +210,9 @@
gboolean is_id)
{
InitialWindow *iw;
-
+
iw = g_slice_new (InitialWindow);
-
+
iw->tabs = g_list_prepend (NULL, initial_tab_new (profile, is_id));
iw->force_menubar_state = FALSE;
iw->menubar_state = FALSE;
@@ -220,7 +220,7 @@
iw->start_maximized = FALSE;
iw->geometry = NULL;
iw->role = NULL;
-
+
return iw;
}
@@ -243,7 +243,7 @@
iw->role = results->default_role;
results->default_role = NULL;
}
-
+
if (iw->geometry == NULL)
iw->geometry = g_strdup (results->default_geometry);
@@ -263,7 +263,7 @@
ensure_top_window (OptionParsingResults *results)
{
InitialWindow *iw;
-
+
if (results->initial_windows == NULL)
{
iw = initial_window_new (NULL, FALSE);
@@ -278,7 +278,7 @@
}
g_assert (iw->tabs);
-
+
return iw;
}
@@ -291,7 +291,7 @@
iw = ensure_top_window (results);
g_assert (iw->tabs);
-
+
it = g_list_last (iw->tabs)->data;
return it;
@@ -305,11 +305,11 @@
InitialWindow *iw;
iw = initial_window_new (profile, is_id);
-
+
apply_defaults (results, iw);
results->initial_windows = g_list_append (results->initial_windows, iw);
-
+
return iw;
}
@@ -327,7 +327,7 @@
}
-static gboolean
+static gboolean
option_command_callback (const gchar *option_name,
const gchar *value,
gpointer data,
@@ -357,7 +357,7 @@
}
-static gboolean
+static gboolean
option_window_callback (const gchar *option_name,
const gchar *value,
gpointer data,
@@ -371,7 +371,7 @@
}
-static gboolean
+static gboolean
option_window_with_profile_callback (const gchar *option_name,
const gchar *value,
gpointer data,
@@ -388,7 +388,7 @@
}
-static gboolean
+static gboolean
option_tab_callback (const gchar *option_name,
const gchar *value,
gpointer data,
@@ -397,12 +397,12 @@
OptionParsingResults *results = data;
InitialWindow *iw;
const char *profile = NULL;
-
+
if (results->initial_windows)
{
iw = g_list_last (results->initial_windows)->data;
- iw->tabs =
+ iw->tabs =
g_list_append (iw->tabs, initial_tab_new (profile, FALSE));
}
else
@@ -414,7 +414,7 @@
}
-static gboolean
+static gboolean
option_tab_with_profile_callback (const gchar *option_name,
const gchar *value,
gpointer data,
@@ -427,7 +427,7 @@
if (results->initial_windows)
{
iw = g_list_last (results->initial_windows)->data;
- iw->tabs =
+ iw->tabs =
g_list_append (iw->tabs, initial_tab_new (profile, FALSE));
}
else
@@ -437,7 +437,7 @@
}
-static gboolean
+static gboolean
option_window_with_profile_internal_id_callback (const gchar *option_name,
const gchar *value,
gpointer data,
@@ -453,7 +453,7 @@
}
-static gboolean
+static gboolean
option_tab_with_profile_internal_id_callback (const gchar *option_name,
const gchar *value,
gpointer data,
@@ -467,7 +467,7 @@
{
iw = g_list_last (results->initial_windows)->data;
- iw->tabs =
+ iw->tabs =
g_list_append (iw->tabs, initial_tab_new (profile, TRUE));
}
else
@@ -477,7 +477,7 @@
}
-static gboolean
+static gboolean
option_role_callback (const gchar *option_name,
const gchar *value,
gpointer data,
@@ -504,7 +504,7 @@
}
-static gboolean
+static gboolean
option_show_menubar_callback (const gchar *option_name,
const gchar *value,
gpointer data,
@@ -537,7 +537,7 @@
}
-static gboolean
+static gboolean
option_hide_menubar_callback (const gchar *option_name,
const gchar *value,
gpointer data,
@@ -549,7 +549,7 @@
if (results->initial_windows)
{
iw = g_list_last (results->initial_windows)->data;
-
+
if (iw->force_menubar_state && iw->menubar_state == FALSE)
{
g_printerr (_("\"%s\" option given twice for the same window\n"),
@@ -558,7 +558,7 @@
}
iw->force_menubar_state = TRUE;
- iw->menubar_state = FALSE;
+ iw->menubar_state = FALSE;
}
else
{
@@ -644,7 +644,7 @@
}
-static gboolean
+static gboolean
option_title_callback (const gchar *option_name,
const gchar *value,
gpointer data,
@@ -659,7 +659,7 @@
}
-static gboolean
+static gboolean
option_working_directory_callback (const gchar *option_name,
const gchar *value,
gpointer data,
@@ -674,7 +674,7 @@
}
-static gboolean
+static gboolean
option_active_callback (const gchar *option_name,
const gchar *value,
gpointer data,
@@ -705,7 +705,7 @@
it = ensure_top_tab (results);
if (results->execute)
- {
+ {
if (results->post_execute_args == NULL)
{
g_set_error (error,
@@ -720,7 +720,7 @@
it = ensure_top_tab (results);
it->exec_argv = results->post_execute_args;
results->post_execute_args = NULL;
- }
+ }
if (results->zoom)
{
@@ -757,11 +757,11 @@
if (val > (TERMINAL_SCALE_MAXIMUM - 1e-6))
{
g_printerr (_("Zoom factor \"%g\" is too large, using %g\n"),
- val,
+ val,
TERMINAL_SCALE_MAXIMUM);
val = TERMINAL_SCALE_MAXIMUM;
}
-
+
it->zoom = val;
it->zoom_set = TRUE;
}
@@ -793,7 +793,7 @@
results->screen_number = -1;
results->default_working_dir = NULL;
-
+
/* pre-scan for -x and --execute options (code from old gnome-terminal) */
results->post_execute_args = NULL;
i = 1;
@@ -809,14 +809,14 @@
last = i;
if (i == *argc)
break; /* we'll complain about this later. */
-
+
results->post_execute_args = g_new0 (char*, *argc - i + 1);
j = 0;
while (i < *argc)
{
results->post_execute_args[j] = g_strdup (argv[i]);
- i++;
+ i++;
j++;
}
results->post_execute_args[j] = NULL;
@@ -824,7 +824,7 @@
/* strip the args we used up, also ends the loop since i >= last */
*argc = last;
}
-
+
++i;
}
@@ -856,7 +856,7 @@
int *argc, char **argv)
{
int i;
-
+
/* The point here is to strip --display, in the case where we
* aren't going via gtk_init()
*/
@@ -864,7 +864,7 @@
while (i < *argc)
{
gboolean remove_two = FALSE;
-
+
if (strcmp (argv[i], "-x") == 0 ||
strcmp (argv[i], "--execute") == 0)
{
@@ -873,7 +873,7 @@
*/
}
else if (strcmp (argv[i], "--display") == 0)
- {
+ {
if ((i + 1) >= *argc)
{
g_printerr (_("No argument given to \"%s\" option\n"), "--display");
@@ -882,20 +882,20 @@
* when not using factory mode.
*/
}
-
+
if (results->display_name)
g_free (results->display_name);
g_assert (i+1 < *argc);
results->display_name = g_strdup (argv[i+1]);
-
+
remove_two = TRUE;
}
else if (strcmp (argv[i], "--screen") == 0)
{
int n;
char *end;
-
+
if ((i + 1) >= *argc)
{
g_printerr (_("\"%s\" option requires an argument\n"), "--screen");
@@ -906,23 +906,23 @@
}
g_assert (i+1 < *argc);
-
+
errno = 0;
end = NULL;
n = g_ascii_strtoll (argv[i+1], &end, 0);
if (errno == 0 && argv[i+1] != end)
results->screen_number = n;
-
+
remove_two = TRUE;
}
if (remove_two)
{
int n_to_move;
-
+
n_to_move = *argc - i - 2;
g_assert (n_to_move >= 0);
-
+
if (n_to_move > 0)
{
g_memmove (&argv[i], &argv[i+2],
@@ -950,31 +950,31 @@
{
GdkDisplay *display = NULL;
GdkScreen *screen;
-
+
/* --screen=screen_number overrides --display */
-
+
screen = NULL;
-
+
if (display_name == NULL)
display = gdk_display_get_default ();
else
{
GSList *displays, *l;
const char *period;
-
+
period = strrchr (display_name, '.');
if (period)
{
gulong n;
char *end;
-
+
errno = 0;
end = NULL;
n = g_ascii_strtoull (period + 1, &end, 0);
if (errno == 0 && (period + 1) != end)
screen_number = n;
}
-
+
displays = gdk_display_manager_list_displays (gdk_display_manager_get ());
for (l = displays; l != NULL; l = l->next)
{
@@ -1016,7 +1016,7 @@
InitialWindow *window;
window = (InitialWindow*) w->data;
-
+
for (t = window->tabs; t ; t = t->next)
{
InitialTab *tab;
@@ -1076,7 +1076,7 @@
{
if (it->profile_is_id)
profile = terminal_app_get_profile_by_name (app, it->profile);
- else
+ else
profile = terminal_app_get_profile_by_visible_name (app, it->profile);
if (profile == NULL)
@@ -1091,7 +1091,7 @@
it->title,
it->working_dir,
it->zoom_set ? it->zoom : 1.0);
-
+
if (it->active)
terminal_window_switch_screen (window, screen);
}
@@ -1166,7 +1166,7 @@
g_assert (atom_type != None);
name = "Fake Window";
- XChangeProperty (xdisplay,
+ XChangeProperty (xdisplay,
xwindow, atom_name,
atom_type,
8, PropModeReplace, (unsigned char *)name, strlen (name));
@@ -1213,7 +1213,7 @@
parsing_results->startup_id = g_strdup (startup_id);
g_unsetenv ("DESKTOP_STARTUP_ID");
}
-
+
gtk_window_set_auto_startup_notification (FALSE); /* we'll do it ourselves due
* to complicated factory setup
*/
@@ -1263,7 +1263,7 @@
/* Forward our display to the child */
insert_args (&argc_copy, argv_copy,
"--display", parsing_results->display_name);
-
+
/* Forward out working directory */
cwd = g_get_current_dir ();
insert_args (&argc_copy, argv_copy,
@@ -1283,7 +1283,7 @@
argv_copy = NULL;
gtk_window_set_default_icon_name (GNOME_TERMINAL_ICON_NAME);
-
+
g_assert (parsing_results->post_execute_args == NULL);
terminal_app_initialize (parsing_results->use_factory);
@@ -1320,7 +1320,7 @@
GOptionContext *context;
GOptionGroup *option_group;
- const GOptionEntry goptions[] = {
+ const GOptionEntry goptions[] = {
{
"command",
'e',
@@ -1519,7 +1519,7 @@
N_("Set the last specified tab as the active one in its window"),
NULL
},
-
+
/*
* Crappy old compat args
*/
@@ -1538,7 +1538,7 @@
G_OPTION_ARG_CALLBACK,
unsupported_option_callback,
NULL, NULL
- },
+ },
{
"nologin",
0,
@@ -1562,7 +1562,7 @@
G_OPTION_ARG_CALLBACK,
unsupported_option_callback,
NULL, NULL
- },
+ },
{
"background",
0,
@@ -1594,7 +1594,7 @@
G_OPTION_ARG_CALLBACK,
unsupported_option_callback,
NULL, NULL
- },
+ },
{
"shaded",
0,
@@ -1602,7 +1602,7 @@
G_OPTION_ARG_CALLBACK,
unsupported_option_callback,
NULL, NULL
- },
+ },
{
"noshaded",
0,
@@ -1610,7 +1610,7 @@
G_OPTION_ARG_CALLBACK,
unsupported_option_callback,
NULL, NULL
- },
+ },
{
"transparent",
0,
@@ -1618,7 +1618,7 @@
G_OPTION_ARG_CALLBACK,
unsupported_option_callback,
NULL, NULL
- },
+ },
{
"utmp",
0,
@@ -1626,7 +1626,7 @@
G_OPTION_ARG_CALLBACK,
unsupported_option_callback,
NULL, NULL
- },
+ },
{
"noutmp",
0,
@@ -1634,7 +1634,7 @@
G_OPTION_ARG_CALLBACK,
unsupported_option_callback,
NULL, NULL
- },
+ },
{
"wtmp",
0,
@@ -1650,7 +1650,7 @@
G_OPTION_ARG_CALLBACK,
unsupported_option_callback,
NULL, NULL
- },
+ },
{
"lastlog",
0,
@@ -1658,7 +1658,7 @@
G_OPTION_ARG_CALLBACK,
unsupported_option_callback,
NULL, NULL
- },
+ },
{
"nolastlog",
0,
@@ -1674,7 +1674,7 @@
G_OPTION_ARG_CALLBACK,
unsupported_option_callback,
NULL, NULL
- },
+ },
{
"termname",
0,
@@ -1722,12 +1722,12 @@
g_assert (initialization_complete);
parsing_results = option_parsing_results_new (&argc, argv);
-
+
/* Find and parse --display */
option_parsing_results_check_for_display_name (parsing_results,
&argc,
argv);
-
+
context = get_goption_context (parsing_results);
g_option_context_set_ignore_unknown_options (context, TRUE);
if(!g_option_context_parse (context, &argc, &argv, &error))
@@ -1776,7 +1776,7 @@
* Invoked remotely to instantiate a terminal with the
* given arguments.
*/
-static gboolean
+static gboolean
terminal_factory_new_terminal (TerminalFactory *factory,
const char **argv,
GError **error)
@@ -1807,7 +1807,7 @@
connection = dbus_g_bus_get (DBUS_BUS_SESSION, error);
if (connection == NULL)
return FALSE;
-
+
proxy = dbus_g_proxy_new_for_name (connection,
DBUS_SERVICE_DBUS,
DBUS_PATH_DBUS,
@@ -1816,14 +1816,14 @@
dbus_g_proxy_add_signal (proxy, "NameOwnerChanged",
G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING,
G_TYPE_INVALID);
- dbus_g_proxy_connect_signal (proxy, "NameOwnerChanged",
+ dbus_g_proxy_connect_signal (proxy, "NameOwnerChanged",
G_CALLBACK (name_owner_changed), factory, NULL);
#endif
- if (!org_freedesktop_DBus_request_name (proxy,
+ if (!org_freedesktop_DBus_request_name (proxy,
TERMINAL_FACTORY_SERVICE_NAME,
- DBUS_NAME_FLAG_DO_NOT_QUEUE,
- &request_name_ret,
+ DBUS_NAME_FLAG_DO_NOT_QUEUE,
+ &request_name_ret,
error))
return FALSE;
@@ -1838,7 +1838,7 @@
dbus_g_connection_register_g_object (connection,
TERMINAL_FACTORY_SERVICE_PATH,
G_OBJECT (factory));
-
+
*is_owner = TRUE;
#ifdef DEBUG_FACTORY
g_print ("Successfully registered factory \"%s\"\n", per_display_iid);
@@ -1885,8 +1885,8 @@
TERMINAL_FACTORY_SERVICE_NAME,
TERMINAL_FACTORY_SERVICE_PATH,
TERMINAL_FACTORY_INTERFACE_NAME);
- if (!org_gnome_Terminal_Factory_new_terminal (proxy,
- (const char **) args,
+ if (!org_gnome_Terminal_Factory_new_terminal (proxy,
+ (const char **) args,
&error)) {
g_free (args);
g_printerr ("Failed to start new terminal: %s\n", error->message);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
