diff options
author | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-08-03 23:49:10 +0800 |
---|---|---|
committer | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-08-04 17:10:20 +0800 |
commit | 2e7a0efc837d4b38290dffbd04a1c9d70df64db2 (patch) | |
tree | c779badde862e83bac3fa393bafa4183c584f6ba /src/empathy.c | |
parent | d801233c1f25596c429d75d03ec6282d1b3828e2 (diff) | |
download | gsoc2013-empathy-2e7a0efc837d4b38290dffbd04a1c9d70df64db2.tar.gz gsoc2013-empathy-2e7a0efc837d4b38290dffbd04a1c9d70df64db2.tar.zst gsoc2013-empathy-2e7a0efc837d4b38290dffbd04a1c9d70df64db2.zip |
Use the new enum everywhere
And use strings for the --show-preferences argument.
Diffstat (limited to 'src/empathy.c')
-rw-r--r-- | src/empathy.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/empathy.c b/src/empathy.c index 66b387788..3506319fa 100644 --- a/src/empathy.c +++ b/src/empathy.c @@ -107,7 +107,7 @@ struct _EmpathyApp gboolean no_connect; gboolean start_hidden; gboolean show_preferences; - gint preferences_tab; + gchar *preferences_tab; gboolean activated; @@ -173,6 +173,8 @@ empathy_app_finalize (GObject *object) void (*finalize) (GObject *) = G_OBJECT_CLASS (empathy_app_parent_class)->finalize; + g_free (self->preferences_tab); + if (self->window != NULL) gtk_widget_destroy (self->window); @@ -319,10 +321,8 @@ preferences_cb (const char *option_name, self->show_preferences = TRUE; - self->preferences_tab = -1; - - if (value != NULL) - self->preferences_tab = atoi (value); + g_free (self->preferences_tab); + self->preferences_tab = g_strdup (value); return TRUE; } |