Use the new enum everywhere

And use strings for the --show-preferences argument.

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;
 }