applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

application: Use modern g_autoptr practices

Browse source 
This saves us some lines of code, and modernizes the
codebase a little bit.
This commit is contained in:
Georges Basile Stavracas Neto 2018-03-06 22:05:03 -03:00
parent 23fadca422
commit de5d1a2417
1 changed files with 14 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

34
shell/cc-application.c
View file

@ -80,19 +80,18 @@ launch_panel_activated (GSimpleAction *action,
gpointer user_data) gpointer user_data)
{ {
CcApplication *self = CC_APPLICATION (user_data); CcApplication *self = CC_APPLICATION (user_data);
GError *error = NULL; g_autoptr (GVariant) parameters = NULL;
g_autoptr (GError) error = NULL;
gchar *panel_id; gchar *panel_id;
GVariant *parameters;
g_variant_get (parameter, "(&s@av)", &panel_id, &parameters); g_variant_get (parameter, "(&s@av)", &panel_id, &parameters);
g_debug ("gnome-control-center: 'launch-panel' activated for panel '%s' with %"G_GSIZE_FORMAT" arguments", g_debug ("gnome-control-center: 'launch-panel' activated for panel '%s' with %"G_GSIZE_FORMAT" arguments",
panel_id, g_variant_n_children (parameters)); panel_id,
g_variant_n_children (parameters));
if (!cc_shell_set_active_panel_from_id (CC_SHELL (self->window), panel_id, parameters, &error)) if (!cc_shell_set_active_panel_from_id (CC_SHELL (self->window), panel_id, parameters, &error))
{ g_warning ("Failed to activate the '%s' panel: %s", panel_id, error->message);
g_warning ("Failed to activate the '%s' panel: %s", panel_id, error->message);
g_error_free (error);
}
g_variant_unref (parameters);
/* Now present the window */ /* Now present the window */
g_application_activate (G_APPLICATION (self)); g_application_activate (G_APPLICATION (self));
@ -110,7 +109,8 @@ cc_application_handle_local_options (GApplication *application,
if (g_variant_dict_contains (options, "list")) if (g_variant_dict_contains (options, "list"))
{ {
GList *panels, *l; g_autoptr(GList) panels = NULL;
g_autoptr(GList) l = NULL;
panels = cc_panel_loader_get_panels (); panels = cc_panel_loader_get_panels ();
@ -118,8 +118,6 @@ cc_application_handle_local_options (GApplication *application,
for (l = panels; l != NULL; l = l->next) for (l = panels; l != NULL; l = l->next)
g_print ("\t%s\n", (char *) l->data); g_print ("\t%s\n", (char *) l->data);
g_list_free (panels);
return 0; return 0;
} }
@ -130,13 +128,14 @@ static int
cc_application_command_line (GApplication *application, cc_application_command_line (GApplication *application,
GApplicationCommandLine *command_line) GApplicationCommandLine *command_line)
{ {
CcApplication *self = CC_APPLICATION (application); CcApplication *self;
g_autofree GStrv start_panels = NULL;
GVariantDict *options; GVariantDict *options;
int retval = 0; int retval = 0;
char *search_str; char *search_str;
GStrv start_panels = NULL;
gboolean debug; gboolean debug;
self = CC_APPLICATION (application);
options = g_application_command_line_get_options_dict (command_line); options = g_application_command_line_get_options_dict (command_line);
debug = g_variant_dict_contains (options, "verbose"); debug = g_variant_dict_contains (options, "verbose");
@ -178,17 +177,12 @@ cc_application_command_line (GApplication *application,
g_warning ("Could not load setting panel \"%s\": %s", start_id, g_warning ("Could not load setting panel \"%s\": %s", start_id,
(err) ? err->message : "Unknown error"); (err) ? err->message : "Unknown error");
retval = 1; retval = 1;
if (err) if (err)
{ g_clear_error (&err);
g_error_free (err);
err = NULL;
}
} }
} }
g_free (start_panels);
start_panels = NULL;
return retval; return retval;
} }