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

datetime: Clean up error handling

Browse source 
Avoid using two GError variables in a single function to reduce
programmer confusion. Instead, only use one and clear it with
g_clear_error() when we need to reuse it.

Pointed out by Rui Matos.

https://bugzilla.gnome.org/show_bug.cgi?id=694985
This commit is contained in:
Kalev Lember 2013-08-19 23:55:52 +02:00
parent a0d156d19a
commit f90edf44b1
1 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
panels/datetime/cc-datetime-panel.c
View file

@ -1075,14 +1075,13 @@ cc_date_time_panel_init (CcDateTimePanel *self)
"min_down_button", "ampm_up_button", "ampm_down_button" }; "min_down_button", "ampm_up_button", "ampm_down_button" };
GtkWidget *widget; GtkWidget *widget;
GtkAdjustment *adjustment; GtkAdjustment *adjustment;
GError *err = NULL; GError *error;
GtkTreeModelFilter *city_modelfilter; GtkTreeModelFilter *city_modelfilter;
GtkTreeModelSort *city_modelsort; GtkTreeModelSort *city_modelsort;
const char *ampm; const char *ampm;
guint i, num_days; guint i, num_days;
int ret; int ret;
DateEndianess endianess; DateEndianess endianess;
GError *error;
priv = self->priv = DATE_TIME_PANEL_PRIVATE (self); priv = self->priv = DATE_TIME_PANEL_PRIVATE (self);
g_resources_register (cc_datetime_get_resource ()); g_resources_register (cc_datetime_get_resource ());
@ -1097,19 +1096,19 @@ cc_date_time_panel_init (CcDateTimePanel *self)
&error); &error);
if (priv->dtm == NULL) { if (priv->dtm == NULL) {
g_warning ("could not get proxy for DateTimeMechanism: %s", error->message); g_warning ("could not get proxy for DateTimeMechanism: %s", error->message);
g_error_free (error); g_clear_error (&error);
} }
priv->builder = gtk_builder_new (); priv->builder = gtk_builder_new ();
ret = gtk_builder_add_from_resource (priv->builder, ret = gtk_builder_add_from_resource (priv->builder,
"/org/gnome/control-center/datetime/datetime.ui", "/org/gnome/control-center/datetime/datetime.ui",
&err); &error);
if (ret == 0) if (ret == 0)
{ {
g_warning ("Could not load ui: %s", err ? err->message : "No reason"); g_warning ("Could not load ui: %s", error ? error->message : "No reason");
if (err) if (error)
g_error_free (err); g_error_free (error);
return; return;
} }