EmpathyTpContactFactory: If the presence dict doesn't contain a presence-message...

[empathy.git] / libempathy-gtk / empathy-account-widget-generic.c

diff --git a/libempathy-gtk/empathy-account-widget-generic.c b/libempathy-gtk/empathy-account-widget-generic.c
index 3c7385f487ea0856a7d422529e59c782614a9aaa..8ade3f26f59d8fa33f3d4cac8cb297f57e844e58 100644 (file)
--- a/libempathy-gtk/empathy-account-widget-generic.c
+++ b/libempathy-gtk/empathy-account-widget-generic.c
@@ -48,19 +48,6 @@ typedef struct {
        guint          n_rows;
 } EmpathyAccountWidgetGeneric;
 
-static gboolean account_widget_generic_entry_focus_cb         (GtkWidget                  *widget,
-                                                              GdkEventFocus              *event,
-                                                              EmpathyAccountWidgetGeneric *settings);
-static void     account_widget_generic_int_changed_cb         (GtkWidget                  *widget,
-                                                              EmpathyAccountWidgetGeneric *settings);
-static void     account_widget_generic_checkbutton_toggled_cb (GtkWidget                  *widget,
-                                                              EmpathyAccountWidgetGeneric *settings);
-static gchar *  account_widget_generic_format_param_name      (const gchar                *param_name);
-static void     account_widget_generic_setup_foreach          (McProtocolParam            *param,
-                                                              EmpathyAccountWidgetGeneric *settings);
-static void     account_widget_generic_destroy_cb             (GtkWidget                  *widget,
-                                                              EmpathyAccountWidgetGeneric *settings);
-
 static gboolean 
 account_widget_generic_entry_focus_cb (GtkWidget                  *widget,
                                       GdkEventFocus              *event,
@@ -131,7 +118,7 @@ static void
 account_widget_generic_setup_foreach (McProtocolParam            *param,
                                      EmpathyAccountWidgetGeneric *settings)
 {
-       GtkWidget *widget;
+       GtkWidget *widget = NULL;
        gchar     *param_name_formatted;
 
        param_name_formatted = account_widget_generic_format_param_name (param->name);
@@ -258,13 +245,14 @@ account_widget_generic_setup_foreach (McProtocolParam            *param,
                empathy_debug (DEBUG_DOMAIN,
                               "Unknown signature for param %s: %s\n",
                               param_name_formatted, param->signature);
-               g_assert_not_reached ();
        }
 
-       g_free (param_name_formatted);
+       if (widget) {
+               g_object_set_data_full (G_OBJECT (widget), "param_name", 
+                                       g_strdup (param->name), g_free);
+       }
 
-       g_object_set_data_full (G_OBJECT (widget), "param_name", 
-                               g_strdup (param->name), g_free);
+       g_free (param_name_formatted);
 }
 
 static void