gatuno
/
gatuno-terminal
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

make indent more uniform in a few files

master-1.22
monsta 2017-12-25 17:53:32 +03:00
parent 08bebc7780
commit 26ded92d74
3 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/terminal-options.c
View File

@ -51,7 +51,7 @@ initial_tab_new (const char *profile,
it->zoom = 1.0; it->zoom = 1.0;
it->zoom_set = FALSE; it->zoom_set = FALSE;
it->active = FALSE; it->active = FALSE;
it->attach_window = FALSE; it->attach_window = FALSE;
return it; return it;
} }
@ -306,8 +306,8 @@ option_tab_callback (const gchar *option_name,
{ {
TerminalOptions *options = data; TerminalOptions *options = data;
gboolean is_profile_id; gboolean is_profile_id;
InitialWindow *iw; InitialWindow *iw;
InitialTab *it; InitialTab *it;
is_profile_id = g_str_has_suffix (option_name, "-with-profile-internal-id"); 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)); iw->tabs = g_list_append (iw->tabs, initial_tab_new (value, is_profile_id));
} }
else else
{ {
iw = add_new_window (options, value, is_profile_id); iw = add_new_window (options, value, is_profile_id);
it = g_list_last(iw->tabs)->data; it = g_list_last(iw->tabs)->data;
it->attach_window = TRUE; it->attach_window = TRUE;
} }
return TRUE; return TRUE;
} }
@ -712,7 +712,7 @@ terminal_options_parse (const char *working_directory,
options->default_maximize = FALSE; options->default_maximize = FALSE;
options->execute = FALSE; options->execute = FALSE;
options->use_factory = TRUE; options->use_factory = TRUE;
options->initial_workspace = -1; options->initial_workspace = -1;
options->env = g_strdupv (env); options->env = g_strdupv (env);
options->startup_id = g_strdup (startup_id && startup_id[0] ? startup_id : NULL); options->startup_id = g_strdup (startup_id && startup_id[0] ? startup_id : NULL);

4
src/terminal-options.h
View File

@ -53,7 +53,7 @@ typedef struct
char *config_file; char *config_file;
gboolean load_config; gboolean load_config;
gboolean save_config; gboolean save_config;
int initial_workspace; int initial_workspace;
} TerminalOptions; } TerminalOptions;
typedef struct typedef struct
@ -66,7 +66,7 @@ typedef struct
double zoom; double zoom;
guint zoom_set : 1; guint zoom_set : 1;
guint active : 1; guint active : 1;
guint attach_window : 1; guint attach_window : 1;
} InitialTab; } InitialTab;
typedef struct typedef struct

18
src/terminal.c
View File

@ -147,13 +147,13 @@ method_call_cb (GDBusConnection *connection,
TerminalOptions *options = NULL; TerminalOptions *options = NULL;
GVariant *v_wd, *v_display, *v_sid, *v_envv, *v_argv; GVariant *v_wd, *v_display, *v_sid, *v_envv, *v_argv;
char *working_directory = NULL, *display_name = NULL, *startup_id = NULL; char *working_directory = NULL, *display_name = NULL, *startup_id = NULL;
int initial_workspace = -1; int initial_workspace = -1;
char **envv = NULL, **argv = NULL; char **envv = NULL, **argv = NULL;
int argc; int argc;
GError *error = NULL; GError *error = NULL;
g_variant_get (parameters, "(@ay@ay@ay@ayi@ay)", g_variant_get (parameters, "(@ay@ay@ay@ayi@ay)",
&v_wd, &v_display, &v_sid, &v_envv, &initial_workspace, &v_argv); &v_wd, &v_display, &v_sid, &v_envv, &initial_workspace, &v_argv);
working_directory = ay_to_string (v_wd, &error); working_directory = ay_to_string (v_wd, &error);
if (error) if (error)
@ -168,12 +168,12 @@ method_call_cb (GDBusConnection *connection,
argv = ay_to_strv (v_argv, &argc); argv = ay_to_strv (v_argv, &argc);
_terminal_debug_print (TERMINAL_DEBUG_FACTORY, _terminal_debug_print (TERMINAL_DEBUG_FACTORY,
"Factory invoked with working-dir='%s' display='%s' startup-id='%s'" "Factory invoked with working-dir='%s' display='%s' startup-id='%s'"
"workspace='%d'\n", "workspace='%d'\n",
working_directory ? working_directory : "(null)", working_directory ? working_directory : "(null)",
display_name ? display_name : "(null)", display_name ? display_name : "(null)",
startup_id ? startup_id : "(null)", startup_id ? startup_id : "(null)",
initial_workspace); initial_workspace);
options = terminal_options_parse (working_directory, options = terminal_options_parse (working_directory,
display_name, display_name,
@ -230,7 +230,7 @@ bus_acquired_cb (GDBusConnection *connection,
"<arg type='ay' name='display_name' direction='in' />" "<arg type='ay' name='display_name' direction='in' />"
"<arg type='ay' name='startup_id' direction='in' />" "<arg type='ay' name='startup_id' direction='in' />"
"<arg type='ay' name='environment' 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' />" "<arg type='ay' name='arguments' direction='in' />"
"</method>" "</method>"
"</interface>" "</interface>"
@ -338,7 +338,7 @@ name_lost_cb (GDBusConnection *connection,
_terminal_debug_print (TERMINAL_DEBUG_FACTORY, _terminal_debug_print (TERMINAL_DEBUG_FACTORY,
"Forwarding arguments to existing instance\n"); "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->default_working_dir));
g_variant_builder_add (&builder, "@ay", string_to_ay (data->options->display_name)); 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_builder_add (&builder, "@ay",
g_variant_new_from_data (G_VARIANT_TYPE ("ay"), s, len, TRUE, g_free, s)); 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); string = g_string_new (NULL);