Merge branch 'sasl'

[empathy.git] / libempathy-gtk / empathy-presence-chooser.c

diff --git a/libempathy-gtk/empathy-presence-chooser.c b/libempathy-gtk/empathy-presence-chooser.c
index 7c4aae9bafa6f9fbf2e590f2a14f9adaa8dc0d1c..33bf02811bf37a47954e5ca7444c49c321384d01 100644 (file)
--- a/libempathy-gtk/empathy-presence-chooser.c
+++ b/libempathy-gtk/empathy-presence-chooser.c
@@ -21,7 +21,7 @@
  * Authors: Richard Hult <richard@imendio.com>
  *          Martyn Russell <martyn@imendio.com>
  *          Xavier Claessens <xclaesse@gmail.com>
- *          Davyd Madeley <davyd.madeley@collabora.co.uk>
+ *          Danielle Madeley <danielle.madeley@collabora.co.uk>
  */
 
 #include "config.h"
@@ -126,6 +126,7 @@ static struct { TpConnectionPresenceType state;
                         { TP_CONNECTION_PRESENCE_TYPE_UNSET, },
                        };
 
+static void            presence_chooser_constructed            (GObject                    *object);
 static void            presence_chooser_finalize               (GObject                    *object);
 static void            presence_chooser_presence_changed_cb    (EmpathyPresenceChooser      *chooser);
 static void            presence_chooser_menu_add_item          (GtkWidget                  *menu,
@@ -138,13 +139,14 @@ static void            presence_chooser_set_state              (TpConnectionPres
 static void            presence_chooser_custom_activate_cb     (GtkWidget                  *item,
                                                                gpointer                    user_data);
 
-G_DEFINE_TYPE (EmpathyPresenceChooser, empathy_presence_chooser, GTK_TYPE_COMBO_BOX_ENTRY);
+G_DEFINE_TYPE (EmpathyPresenceChooser, empathy_presence_chooser, GTK_TYPE_COMBO_BOX);
 
 static void
 empathy_presence_chooser_class_init (EmpathyPresenceChooserClass *klass)
 {
        GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
+       object_class->constructed = presence_chooser_constructed;
        object_class->finalize = presence_chooser_finalize;
 
        g_type_class_add_private (object_class, sizeof (EmpathyPresenceChooserPriv));
@@ -345,7 +347,7 @@ presence_chooser_set_favorite_icon (EmpathyPresenceChooser *self)
                                         GTK_ENTRY_ICON_SECONDARY,
                                         _("Click to remove this status as a favorite"));
                }
-               else {
+               else if (priv->not_favorite_pixbuf != NULL) {
                        /* custom entries can be favorited */
                        gtk_entry_set_icon_from_pixbuf (GTK_ENTRY (entry),
                                           GTK_ENTRY_ICON_SECONDARY,
@@ -525,12 +527,12 @@ presence_chooser_entry_key_press_event_cb (EmpathyPresenceChooser *self,
 {
        EmpathyPresenceChooserPriv *priv = GET_PRIV (self);
 
-       if (priv->editing_status && event->keyval == GDK_Escape) {
+       if (priv->editing_status && event->keyval == GDK_KEY_Escape) {
                /* the user pressed Escape, undo the editing */
                presence_chooser_reset_status (self);
                return TRUE;
        }
-       else if (event->keyval == GDK_Up || event->keyval == GDK_Down) {
+       else if (event->keyval == GDK_KEY_Up || event->keyval == GDK_KEY_Down) {
                /* ignore */
                return TRUE;
        }
@@ -818,6 +820,9 @@ create_not_favorite_pixbuf (void)
        favorite = empathy_pixbuf_from_icon_name ("emblem-favorite",
                                                  GTK_ICON_SIZE_MENU);
 
+       if (favorite == NULL)
+               return NULL;
+
        result = gdk_pixbuf_copy (favorite);
        gdk_pixbuf_saturate_and_pixelate (favorite, result, 1.0, TRUE);
 
@@ -832,7 +837,8 @@ icon_theme_changed_cb (GtkIconTheme *icon_theme,
        EmpathyPresenceChooserPriv *priv = GET_PRIV (self);
 
        /* Theme has changed, recreate the not-favorite icon */
-       g_object_unref (priv->not_favorite_pixbuf);
+       if (priv->not_favorite_pixbuf != NULL)
+               g_object_unref (priv->not_favorite_pixbuf);
        priv->not_favorite_pixbuf = create_not_favorite_pixbuf ();
 
        /* Update the icon */
@@ -844,22 +850,28 @@ empathy_presence_chooser_init (EmpathyPresenceChooser *chooser)
 {
        EmpathyPresenceChooserPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (chooser,
                EMPATHY_TYPE_PRESENCE_CHOOSER, EmpathyPresenceChooserPriv);
-       GtkWidget *entry;
-       GtkCellRenderer *renderer;
 
        chooser->priv = priv;
 
        /* Create the not-favorite icon */
        priv->not_favorite_pixbuf = create_not_favorite_pixbuf ();
-       g_assert (priv->not_favorite_pixbuf != NULL);
+}
+
+static void
+presence_chooser_constructed (GObject *object)
+{
+       EmpathyPresenceChooser *chooser = EMPATHY_PRESENCE_CHOOSER (object);
+       EmpathyPresenceChooserPriv *priv = chooser->priv;
+       GtkWidget *entry;
+       GtkCellRenderer *renderer;
 
-       empathy_signal_connect_weak (gtk_icon_theme_get_default (), "changed",
+       tp_g_signal_connect_object (gtk_icon_theme_get_default (), "changed",
                                     G_CALLBACK (icon_theme_changed_cb),
-                                    G_OBJECT (chooser));
+                                    chooser, 0);
 
        presence_chooser_create_model (chooser);
 
-       gtk_combo_box_entry_set_text_column (GTK_COMBO_BOX_ENTRY (chooser),
+       gtk_combo_box_set_entry_text_column (GTK_COMBO_BOX (chooser),
                                             COL_STATUS_TEXT);
        gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (chooser),
                                              combo_row_separator_func,
@@ -918,28 +930,28 @@ empathy_presence_chooser_init (EmpathyPresenceChooser *chooser)
                G_CALLBACK (presence_chooser_presence_changed_cb),
                chooser);
 
-       empathy_signal_connect_weak (priv->account_manager, "account-validity-changed",
+       tp_g_signal_connect_object (priv->account_manager, "account-validity-changed",
                G_CALLBACK (presence_chooser_account_manager_account_validity_changed_cb),
-               G_OBJECT (chooser));
-       empathy_signal_connect_weak (priv->account_manager, "account-removed",
+               chooser, 0);
+       tp_g_signal_connect_object (priv->account_manager, "account-removed",
                G_CALLBACK (presence_chooser_account_manager_account_changed_cb),
-               G_OBJECT (chooser));
-       empathy_signal_connect_weak (priv->account_manager, "account-enabled",
+               chooser, 0);
+       tp_g_signal_connect_object (priv->account_manager, "account-enabled",
                G_CALLBACK (presence_chooser_account_manager_account_changed_cb),
-               G_OBJECT (chooser));
-       empathy_signal_connect_weak (priv->account_manager, "account-disabled",
+               chooser, 0);
+       tp_g_signal_connect_object (priv->account_manager, "account-disabled",
                G_CALLBACK (presence_chooser_account_manager_account_changed_cb),
-               G_OBJECT (chooser));
+               chooser, 0);
 
        /* FIXME: this string sucks */
        gtk_widget_set_tooltip_text (GTK_WIDGET (chooser),
                _("Set your presence and current status"));
 
        priv->connectivity = empathy_connectivity_dup_singleton ();
-       empathy_signal_connect_weak (priv->connectivity,
+       tp_g_signal_connect_object (priv->connectivity,
                "state-change",
                G_CALLBACK (presence_chooser_connectivity_state_change),
-               G_OBJECT (chooser));
+               chooser, 0);
 
        presence_chooser_update_sensitivity (chooser);
 }
@@ -964,7 +976,8 @@ presence_chooser_finalize (GObject *object)
        g_object_unref (priv->idle);
 
        g_object_unref (priv->connectivity);
-       g_object_unref (priv->not_favorite_pixbuf);
+       if (priv->not_favorite_pixbuf != NULL)
+               g_object_unref (priv->not_favorite_pixbuf);
 
        G_OBJECT_CLASS (empathy_presence_chooser_parent_class)->finalize (object);
 }
@@ -979,11 +992,10 @@ presence_chooser_finalize (GObject *object)
 GtkWidget *
 empathy_presence_chooser_new (void)
 {
-       GtkWidget *chooser;
-
-       chooser = g_object_new (EMPATHY_TYPE_PRESENCE_CHOOSER, NULL);
-
-       return chooser;
+       /* FIXME, why can't this go in init ()? */
+       return g_object_new (EMPATHY_TYPE_PRESENCE_CHOOSER,
+               "has-entry", TRUE,
+               NULL);
 }
 
 static void