diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/terminal-options.c | 18 | ||||
| -rw-r--r-- | src/terminal-options.h | 4 | ||||
| -rw-r--r-- | src/terminal.c | 18 |
3 files changed, 20 insertions, 20 deletions
diff --git a/src/terminal-options.c b/src/terminal-options.c index 9d8c1e1..7b16edb 100644 --- a/src/terminal-options.c +++ b/src/terminal-options.c @@ -51,7 +51,7 @@ initial_tab_new (const char *profile, it->zoom = 1.0; it->zoom_set = FALSE; it->active = FALSE; - it->attach_window = FALSE; + it->attach_window = FALSE; return it; } @@ -306,8 +306,8 @@ option_tab_callback (const gchar *option_name, { TerminalOptions *options = data; gboolean is_profile_id; - InitialWindow *iw; - InitialTab *it; + InitialWindow *iw; + InitialTab *it; is_profile_id = g_str_has_suffix (option_name, "-with-profile-internal-id"); @@ -317,11 +317,11 @@ option_tab_callback (const gchar *option_name, iw->tabs = g_list_append (iw->tabs, initial_tab_new (value, is_profile_id)); } else - { - iw = add_new_window (options, value, is_profile_id); - it = g_list_last(iw->tabs)->data; - it->attach_window = TRUE; - } + { + iw = add_new_window (options, value, is_profile_id); + it = g_list_last(iw->tabs)->data; + it->attach_window = TRUE; + } return TRUE; } @@ -712,7 +712,7 @@ terminal_options_parse (const char *working_directory, options->default_maximize = FALSE; options->execute = FALSE; options->use_factory = TRUE; - options->initial_workspace = -1; + options->initial_workspace = -1; options->env = g_strdupv (env); options->startup_id = g_strdup (startup_id && startup_id[0] ? startup_id : NULL); diff --git a/src/terminal-options.h b/src/terminal-options.h index 20f9a3f..2d6d707 100644 --- a/src/terminal-options.h +++ b/src/terminal-options.h @@ -53,7 +53,7 @@ typedef struct char *config_file; gboolean load_config; gboolean save_config; - int initial_workspace; + int initial_workspace; } TerminalOptions; typedef struct @@ -66,7 +66,7 @@ typedef struct double zoom; guint zoom_set : 1; guint active : 1; - guint attach_window : 1; + guint attach_window : 1; } InitialTab; typedef struct diff --git a/src/terminal.c b/src/terminal.c index f8076a8..81aab2d 100644 --- a/src/terminal.c +++ b/src/terminal.c @@ -147,13 +147,13 @@ method_call_cb (GDBusConnection *connection, TerminalOptions *options = NULL; GVariant *v_wd, *v_display, *v_sid, *v_envv, *v_argv; char *working_directory = NULL, *display_name = NULL, *startup_id = NULL; - int initial_workspace = -1; + int initial_workspace = -1; char **envv = NULL, **argv = NULL; int argc; GError *error = NULL; - g_variant_get (parameters, "(@ay@ay@ay@ayi@ay)", - &v_wd, &v_display, &v_sid, &v_envv, &initial_workspace, &v_argv); + g_variant_get (parameters, "(@ay@ay@ay@ayi@ay)", + &v_wd, &v_display, &v_sid, &v_envv, &initial_workspace, &v_argv); working_directory = ay_to_string (v_wd, &error); if (error) @@ -168,12 +168,12 @@ method_call_cb (GDBusConnection *connection, argv = ay_to_strv (v_argv, &argc); _terminal_debug_print (TERMINAL_DEBUG_FACTORY, - "Factory invoked with working-dir='%s' display='%s' startup-id='%s'" - "workspace='%d'\n", + "Factory invoked with working-dir='%s' display='%s' startup-id='%s'" + "workspace='%d'\n", working_directory ? working_directory : "(null)", display_name ? display_name : "(null)", startup_id ? startup_id : "(null)", - initial_workspace); + initial_workspace); options = terminal_options_parse (working_directory, display_name, @@ -230,7 +230,7 @@ bus_acquired_cb (GDBusConnection *connection, "<arg type='ay' name='display_name' direction='in' />" "<arg type='ay' name='startup_id' direction='in' />" "<arg type='ay' name='environment' direction='in' />" - "<arg type='i' name='workspace' direction='in' />" + "<arg type='i' name='workspace' direction='in' />" "<arg type='ay' name='arguments' direction='in' />" "</method>" "</interface>" @@ -338,7 +338,7 @@ name_lost_cb (GDBusConnection *connection, _terminal_debug_print (TERMINAL_DEBUG_FACTORY, "Forwarding arguments to existing instance\n"); - g_variant_builder_init (&builder, G_VARIANT_TYPE ("(ayayayayiay)")); + g_variant_builder_init (&builder, G_VARIANT_TYPE ("(ayayayayiay)")); g_variant_builder_add (&builder, "@ay", string_to_ay (data->options->default_working_dir)); g_variant_builder_add (&builder, "@ay", string_to_ay (data->options->display_name)); @@ -360,7 +360,7 @@ name_lost_cb (GDBusConnection *connection, g_variant_builder_add (&builder, "@ay", g_variant_new_from_data (G_VARIANT_TYPE ("ay"), s, len, TRUE, g_free, s)); - g_variant_builder_add (&builder, "@i", g_variant_new_int32 (data->options->initial_workspace)); + g_variant_builder_add (&builder, "@i", g_variant_new_int32 (data->options->initial_workspace)); string = g_string_new (NULL); |