]> git.0d.be Git - empathy.git/blobdiff - libempathy-gtk/empathy-presence-chooser.c
Merge branch 'master' into tp-tube
[empathy.git] / libempathy-gtk / empathy-presence-chooser.c
index df3a64c9de152579102f98a47aafc219f277e0f9..f4a325b51f7cb9ef343dd6f60732d923dc1cf742 100644 (file)
@@ -31,7 +31,6 @@
 
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
-#include <glade/glade.h>
 #include <gdk/gdkkeysyms.h>
 
 #include <telepathy-glib/util.h>
 #include <libempathy/empathy-utils.h>
 #include <libempathy/empathy-status-presets.h>
 
-// FIXME - what's the correct debug flag?
-#define DEBUG_FLAG EMPATHY_DEBUG_DISPATCHER
+#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include <libempathy/empathy-debug.h>
 
 #include "empathy-ui-utils.h"
 #include "empathy-images.h"
 #include "empathy-presence-chooser.h"
+#include "empathy-status-preset-dialog.h"
+
+/**
+ * SECTION:empathy-presence-chooser
+ * @title:EmpathyPresenceChooser
+ * @short_description: A widget used to change presence
+ * @include: libempathy-gtk/empathy-presence-chooser.h
+ *
+ * #EmpathyPresenceChooser is a widget which extends #GtkComboBoxEntry
+ * to change presence.
+ */
+
+/**
+ * EmpathyAccountChooser:
+ * @parent: parent object
+ *
+ * Widget which extends #GtkComboBoxEntry to change presence.
+ */
 
 /* Flashing delay for icons (milliseconds). */
 #define FLASH_TIMEOUT 500
 
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyPresenceChooser)
+
+/* For custom message dialog */
+enum {
+       COL_ICON,
+       COL_LABEL,
+       COL_PRESENCE,
+       COL_COUNT
+};
+
+/* For combobox's model */
+enum {
+       COL_STATE_ICON_NAME,
+       COL_STATE,
+       COL_STATUS_TEXT,
+       COL_DISPLAY_MARKUP,
+       COL_STATUS_CUSTOMISABLE,
+       COL_TYPE,
+       N_COLUMNS
+};
+
+typedef enum  {
+       ENTRY_TYPE_BUILTIN,
+       ENTRY_TYPE_SAVED,
+       ENTRY_TYPE_CUSTOM,
+       ENTRY_TYPE_SEPARATOR,
+       ENTRY_TYPE_EDIT_CUSTOM,
+} PresenceChooserEntryType;
+
 typedef struct {
        EmpathyIdle *idle;
 
@@ -62,30 +106,13 @@ typedef struct {
        guint        focus_out_idle_source;
 
        McPresence   state;
-       int          previous_type;
+       PresenceChooserEntryType previous_type;
 
        McPresence   flash_state_1;
        McPresence   flash_state_2;
        guint        flash_timeout_id;
 } EmpathyPresenceChooserPriv;
 
-typedef struct {
-       GtkWidget    *dialog;
-       GtkWidget    *checkbutton_save;
-       GtkWidget    *comboboxentry_message;
-       GtkWidget    *entry_message;
-       GtkWidget    *combobox_status;
-       GtkTreeModel *model_status;
-} CustomMessageDialog;
-
-enum {
-       COL_ICON,
-       COL_LABEL,
-       COL_PRESENCE,
-       COL_COUNT
-};
-
-static CustomMessageDialog *message_dialog = NULL;
 /* States to be listed in the menu.
  * Each state has a boolean telling if it can have custom message */
 static guint states[] = {MC_PRESENCE_AVAILABLE, TRUE,
@@ -111,7 +138,6 @@ static void            presence_chooser_set_state              (McPresence
                                                                const gchar                *status);
 static void            presence_chooser_custom_activate_cb     (GtkWidget                  *item,
                                                                gpointer                    user_data);
-static void            presence_chooser_dialog_show            (GtkWindow                  *parent);
 
 G_DEFINE_TYPE (EmpathyPresenceChooser, empathy_presence_chooser, GTK_TYPE_COMBO_BOX_ENTRY);
 
@@ -125,100 +151,85 @@ empathy_presence_chooser_class_init (EmpathyPresenceChooserClass *klass)
        g_type_class_add_private (object_class, sizeof (EmpathyPresenceChooserPriv));
 }
 
-enum
+static void
+presence_chooser_create_model (EmpathyPresenceChooser *self)
 {
-       COL_STATE_ICON_NAME,
-       COL_STATE,
-       COL_STATUS_TEXT,
-       COL_DISPLAY_MARKUP,
-       COL_STATUS_CUSTOMISABLE,
-       COL_TYPE,
-       N_COLUMNS
-};
+       GtkListStore *store;
+       char *custom_message;
+       int i;
 
-enum
-{
-       ENTRY_TYPE_BUILTIN,
-       ENTRY_TYPE_SAVED,
-       ENTRY_TYPE_CUSTOM,
-       ENTRY_TYPE_SEPARATOR,
-       ENTRY_TYPE_EDIT_CUSTOM,
-};
+       store = gtk_list_store_new (N_COLUMNS,
+                                   G_TYPE_STRING,    /* COL_STATE_ICON_NAME */
+                                   MC_TYPE_PRESENCE, /* COL_STATE */
+                                   G_TYPE_STRING,    /* COL_STATUS_TEXT */
+                                   G_TYPE_STRING,    /* COL_DISPLAY_MARKUP */
+                                   G_TYPE_BOOLEAN,   /* COL_STATUS_CUSTOMISABLE */
+                                   G_TYPE_INT);      /* COL_TYPE */
+
+       custom_message = g_strdup_printf ("<i>%s</i>", _("Custom Message..."));
 
-static GtkTreeModel *
-create_model (void)
-{
-       GtkListStore *store = gtk_list_store_new (N_COLUMNS,
-                       G_TYPE_STRING,          /* COL_STATE_ICON_NAME */
-                       MC_TYPE_PRESENCE,       /* COL_STATE */
-                       G_TYPE_STRING,          /* COL_STATUS_TEXT */
-                       G_TYPE_STRING,          /* COL_DISPLAY_MARKUP */
-                       G_TYPE_BOOLEAN,         /* COL_STATUS_CUSTOMISABLE */
-                       G_TYPE_INT);            /* COL_TYPE */
-       
-       GtkTreeIter iter;
-       
-       int i;
        for (i = 0; i < G_N_ELEMENTS (states); i += 2) {
                GList       *list, *l;
+               const char *status, *icon_name;
 
-               const char *status = empathy_presence_get_default_message (states[i]);
-               const char *icon_name = empathy_icon_name_for_presence (states[i]);
-
-               gtk_list_store_append (store, &iter);
-               gtk_list_store_set (store, &iter,
-                               COL_STATE_ICON_NAME, icon_name,
-                               COL_STATE, states[i],
-                               COL_STATUS_TEXT, status,
-                               COL_DISPLAY_MARKUP, status,
-                               COL_STATUS_CUSTOMISABLE, states[i+1],
-                               COL_TYPE, ENTRY_TYPE_BUILTIN,
-                               -1);
+               status = empathy_presence_get_default_message (states[i]);
+               icon_name = empathy_icon_name_for_presence (states[i]);
+
+               gtk_list_store_insert_with_values (store, NULL, -1,
+                       COL_STATE_ICON_NAME, icon_name,
+                       COL_STATE, states[i],
+                       COL_STATUS_TEXT, status,
+                       COL_DISPLAY_MARKUP, status,
+                       COL_STATUS_CUSTOMISABLE, states[i+1],
+                       COL_TYPE, ENTRY_TYPE_BUILTIN,
+                       -1);
 
                if (states[i+1]) {
+
                        /* Set custom messages if wanted */
-                       list = empathy_status_presets_get (states[i], 5);
+                       list = empathy_status_presets_get (states[i], -1);
+                       list = g_list_sort (list, (GCompareFunc) g_utf8_collate);
                        for (l = list; l; l = l->next) {
-                               gtk_list_store_append (store, &iter);
-                               gtk_list_store_set (store, &iter,
-                                               COL_STATE_ICON_NAME, icon_name,
-                                               COL_STATE, states[i],
-                                               COL_STATUS_TEXT, l->data,
-                                               COL_DISPLAY_MARKUP, l->data,
-                                               COL_STATUS_CUSTOMISABLE, TRUE,
-                                               COL_TYPE, ENTRY_TYPE_SAVED,
-                                               -1);
-                       }
-                       g_list_free (list);
-               
-                       gtk_list_store_append (store, &iter);
-                       gtk_list_store_set (store, &iter,
+                               gtk_list_store_insert_with_values (store,
+                                       NULL, -1,
                                        COL_STATE_ICON_NAME, icon_name,
                                        COL_STATE, states[i],
-                                       COL_STATUS_TEXT, "",
-                                       COL_DISPLAY_MARKUP, "<i>Custom Message...</i>",
+                                       COL_STATUS_TEXT, l->data,
+                                       COL_DISPLAY_MARKUP, l->data,
                                        COL_STATUS_CUSTOMISABLE, TRUE,
-                                       COL_TYPE, ENTRY_TYPE_CUSTOM,
+                                       COL_TYPE, ENTRY_TYPE_SAVED,
                                        -1);
+                       }
+                       g_list_free (list);
+
+                       gtk_list_store_insert_with_values (store, NULL, -1,
+                               COL_STATE_ICON_NAME, icon_name,
+                               COL_STATE, states[i],
+                               COL_STATUS_TEXT, "",
+                               COL_DISPLAY_MARKUP, custom_message,
+                               COL_STATUS_CUSTOMISABLE, TRUE,
+                               COL_TYPE, ENTRY_TYPE_CUSTOM,
+                               -1);
                }
 
        }
-       
+
        /* add a separator */
-       gtk_list_store_append (store, &iter);
-       gtk_list_store_set (store, &iter,
+       gtk_list_store_insert_with_values (store, NULL, -1,
                        COL_TYPE, ENTRY_TYPE_SEPARATOR,
                        -1);
-       
-       gtk_list_store_append (store, &iter);
-       gtk_list_store_set (store, &iter,
-                       COL_STATE_ICON_NAME, GTK_STOCK_EDIT,
-                       COL_STATUS_TEXT, "",
-                       COL_DISPLAY_MARKUP, "Edit Custom Messages...",
-                       COL_TYPE, ENTRY_TYPE_EDIT_CUSTOM,
-                       -1);
 
-       return GTK_TREE_MODEL (store);
+       gtk_list_store_insert_with_values (store, NULL, -1,
+               COL_STATE_ICON_NAME, GTK_STOCK_EDIT,
+               COL_STATUS_TEXT, "",
+               COL_DISPLAY_MARKUP, _("Edit Custom Messages..."),
+               COL_TYPE, ENTRY_TYPE_EDIT_CUSTOM,
+               -1);
+
+       g_free (custom_message);
+
+       gtk_combo_box_set_model (GTK_COMBO_BOX (self), GTK_TREE_MODEL (store));
+       g_object_unref (store);
 }
 
 static void
@@ -230,21 +241,107 @@ presence_chooser_popup_shown_cb (GObject *self,
        gboolean shown;
 
        g_object_get (self, "popup-shown", &shown, NULL);
-
-       if (!shown) return;
+       if (!shown) {
+               return;
+       }
 
        /* see presence_chooser_entry_focus_out_cb() for what this does */
-       if (priv->focus_out_idle_source != 0)
-       {
+       if (priv->focus_out_idle_source != 0) {
                g_source_remove (priv->focus_out_idle_source);
                priv->focus_out_idle_source = 0;
        }
 
-       GtkTreeModel *model = create_model ();
+       presence_chooser_create_model (EMPATHY_PRESENCE_CHOOSER (self));
+}
 
-       gtk_combo_box_set_model (GTK_COMBO_BOX (self), GTK_TREE_MODEL (model));
-       
-       g_object_unref (model);
+static PresenceChooserEntryType
+presence_chooser_get_entry_type (EmpathyPresenceChooser *self)
+{
+       GtkTreeIter iter;
+       PresenceChooserEntryType type = -1;
+
+       if (!gtk_combo_box_get_active_iter (GTK_COMBO_BOX (self), &iter)) {
+               type = ENTRY_TYPE_CUSTOM;
+       }
+       else {
+               GtkTreeModel *model;
+
+               model = gtk_combo_box_get_model (GTK_COMBO_BOX (self));
+               gtk_tree_model_get (model, &iter,
+                                   COL_TYPE, &type,
+                                   -1);
+       }
+
+       return type;
+}
+
+static gboolean
+presence_chooser_is_preset (EmpathyPresenceChooser *self)
+{
+       EmpathyPresenceChooserPriv *priv = GET_PRIV (self);
+       McPresence state;
+       const char *status;
+       GList *presets, *l;
+       gboolean match = FALSE;
+
+       state = empathy_idle_get_state (priv->idle);
+       status = empathy_idle_get_status (priv->idle);
+
+       presets = empathy_status_presets_get (state, -1);
+       for (l = presets; l; l = l->next) {
+               char *preset = (char *) l->data;
+
+               if (!strcmp (status, preset)) {
+                       match = TRUE;
+                       break;
+               }
+       }
+
+       g_list_free (presets);
+
+       DEBUG ("is_preset(%i, %s) = %i\n", state, status, match);
+
+       return match;
+}
+
+static void
+presence_chooser_set_favorite_icon (EmpathyPresenceChooser *self)
+{
+       GtkWidget *entry;
+       PresenceChooserEntryType type;
+
+       entry = gtk_bin_get_child (GTK_BIN (self));
+       type = presence_chooser_get_entry_type (self);
+
+       if (type == ENTRY_TYPE_CUSTOM || type == ENTRY_TYPE_SAVED) {
+               if (presence_chooser_is_preset (self)) {
+                       /* saved entries can be removed from the list */
+                       gtk_entry_set_icon_from_icon_name (GTK_ENTRY (entry),
+                                          GTK_ENTRY_ICON_SECONDARY,
+                                          "empathy-starred");
+                       gtk_entry_set_icon_tooltip_text (GTK_ENTRY (entry),
+                                        GTK_ENTRY_ICON_SECONDARY,
+                                        _("Click to remove this status as a favorite"));
+               }
+               else {
+                       /* custom entries can be favorited */
+                       gtk_entry_set_icon_from_icon_name (GTK_ENTRY (entry),
+                                          GTK_ENTRY_ICON_SECONDARY,
+                                          "empathy-unstarred");
+                       gtk_entry_set_icon_tooltip_text (GTK_ENTRY (entry),
+                                        GTK_ENTRY_ICON_SECONDARY,
+                                        _("Click to make this status a favorite"));
+               }
+       }
+       else {
+               /* built-in entries cannot be favorited */
+               gtk_entry_set_icon_from_stock (GTK_ENTRY (entry),
+                                          GTK_ENTRY_ICON_SECONDARY,
+                                          NULL);
+               gtk_entry_set_icon_tooltip_text (GTK_ENTRY (entry),
+                                        GTK_ENTRY_ICON_SECONDARY,
+                                        NULL);
+       }
 }
 
 static void
@@ -252,48 +349,43 @@ presence_chooser_set_status_editing (EmpathyPresenceChooser *self,
                                      gboolean editing)
 {
        EmpathyPresenceChooserPriv *priv = GET_PRIV (self);
-       GtkWidget *entry = gtk_bin_get_child (GTK_BIN (self));
+       GtkWidget *entry;
 
-       if (priv->block_set_editing) return;
+       if (priv->block_set_editing) {
+               return;
+       }
 
-       if (editing)
-       {
+       entry = gtk_bin_get_child (GTK_BIN (self));
+       if (editing) {
                priv->editing_status = TRUE;
 
                gtk_entry_set_icon_from_stock (GTK_ENTRY (entry),
-                               GTK_ENTRY_ICON_SECONDARY,
-                               GTK_STOCK_OK);
+                                              GTK_ENTRY_ICON_SECONDARY,
+                                              GTK_STOCK_OK);
                gtk_entry_set_icon_tooltip_text (GTK_ENTRY (entry),
-                               GTK_ENTRY_ICON_SECONDARY,
-                               _("Set status"));
+                                                GTK_ENTRY_ICON_SECONDARY,
+                                                _("Set status"));
                gtk_entry_set_icon_sensitive (GTK_ENTRY (entry),
-                               GTK_ENTRY_ICON_PRIMARY,
-                               FALSE);
-       }
-       else
-       {
-               gtk_entry_set_icon_from_stock (GTK_ENTRY (entry),
-                               GTK_ENTRY_ICON_SECONDARY,
-                               NULL);
-               gtk_entry_set_icon_tooltip_text (GTK_ENTRY (entry),
-                               GTK_ENTRY_ICON_SECONDARY,
-                               NULL);
+                                             GTK_ENTRY_ICON_PRIMARY,
+                                             FALSE);
+       } else {
+               GtkWidget *window;
+
+               presence_chooser_set_favorite_icon (self);
                gtk_entry_set_icon_sensitive (GTK_ENTRY (entry),
-                               GTK_ENTRY_ICON_PRIMARY,
-                               TRUE);
+                                             GTK_ENTRY_ICON_PRIMARY,
+                                             TRUE);
 
                /* attempt to get the toplevel for this widget */
-               GtkWidget *window = gtk_widget_get_toplevel (GTK_WIDGET (self));
-               if (GTK_WIDGET_TOPLEVEL (window) && GTK_IS_WINDOW (window))
-               {
+               window = gtk_widget_get_toplevel (GTK_WIDGET (self));
+               if (GTK_WIDGET_TOPLEVEL (window) && GTK_IS_WINDOW (window)) {
                        /* unset the focus */
                        gtk_window_set_focus (GTK_WINDOW (window), NULL);
                }
 
                /* see presence_chooser_entry_focus_out_cb()
                 * for what this does */
-               if (priv->focus_out_idle_source != 0)
-               {
+               if (priv->focus_out_idle_source != 0) {
                        g_source_remove (priv->focus_out_idle_source);
                        priv->focus_out_idle_source = 0;
                }
@@ -308,34 +400,41 @@ static void
 mc_set_custom_state (EmpathyPresenceChooser *self)
 {
        EmpathyPresenceChooserPriv *priv = GET_PRIV (self);
-       GtkWidget *entry = gtk_bin_get_child (GTK_BIN (self));
+       GtkWidget *entry;
+       const char *status;
 
+       entry = gtk_bin_get_child (GTK_BIN (self));
        /* update the status with MC */
-       const char *status = gtk_entry_get_text (GTK_ENTRY (entry));
+       status = gtk_entry_get_text (GTK_ENTRY (entry));
+
        DEBUG ("Sending state to MC-> %s (%s)\n",
-                       g_enum_get_value (g_type_class_peek (MC_TYPE_PRESENCE),
-                               priv->state)->value_name,
-                       status);
+               g_enum_get_value (g_type_class_peek (MC_TYPE_PRESENCE),
+                       priv->state)->value_name,
+               status);
+
        empathy_idle_set_presence (priv->idle, priv->state, status);
 }
 
 static void
 ui_set_custom_state (EmpathyPresenceChooser *self,
-                          McPresence state,
-                          const char *status)
+                    McPresence state,
+                    const char *status)
 {
        EmpathyPresenceChooserPriv *priv = GET_PRIV (self);
-       GtkWidget *entry = gtk_bin_get_child (GTK_BIN (self));
+       GtkWidget *entry;
        const char *icon_name;
 
+       entry = gtk_bin_get_child (GTK_BIN (self));
+
        priv->block_set_editing++;
        priv->block_changed++;
 
        icon_name = empathy_icon_name_for_presence (state);
        gtk_entry_set_icon_from_icon_name (GTK_ENTRY (entry),
-                       GTK_ENTRY_ICON_PRIMARY,
-                       icon_name);
+                                          GTK_ENTRY_ICON_PRIMARY,
+                                          icon_name);
        gtk_entry_set_text (GTK_ENTRY (entry), status);
+       presence_chooser_set_favorite_icon (self);
 
        priv->block_changed--;
        priv->block_set_editing--;
@@ -345,44 +444,68 @@ static void
 presence_chooser_reset_status (EmpathyPresenceChooser *self)
 {
        /* recover the status that was unset */
+       presence_chooser_set_status_editing (self, FALSE);
        presence_chooser_presence_changed_cb (self);
 }
 
 static void
-presence_chooser_entry_icon_release_cb (EmpathyPresenceChooser *self,
-                                        GtkEntryIconPosition    icon_pos,
-                                        GdkEvent               *event,
-                                       GtkEntry                *entry)
+presence_chooser_entry_icon_release_cb (EmpathyPresenceChooser *self,
+                                        GtkEntryIconPosition    icon_pos,
+                                        GdkEvent               *event,
+                                       GtkEntry               *entry)
 {
-       presence_chooser_set_status_editing (self, FALSE);
-       mc_set_custom_state (self);
+       EmpathyPresenceChooserPriv *priv = GET_PRIV (self);
+
+       if (priv->editing_status) {
+               presence_chooser_set_status_editing (self, FALSE);
+               mc_set_custom_state (self);
+       }
+       else {
+               PresenceChooserEntryType type;
+               McPresence state;
+               const char *status;
+
+               type = presence_chooser_get_entry_type (self);
+               state = empathy_idle_get_state (priv->idle);
+               status = empathy_idle_get_status (priv->idle);
+
+               if (presence_chooser_is_preset (self)) {
+                       /* remove the entry */
+                       DEBUG ("REMOVING PRESET (%i, %s)\n", state, status);
+                       empathy_status_presets_remove (state, status);
+               }
+               else {
+                       /* save the entry */
+                       DEBUG ("SAVING PRESET (%i, %s)\n", state, status);
+                       empathy_status_presets_set_last (state, status);
+               }
+
+               /* update the icon */
+               presence_chooser_set_favorite_icon (self);
+       }
 }
 
 static void
-presence_chooser_entry_activate_cb (EmpathyPresenceChooser     *self,
-                                    GtkEntry                   *entry)
+presence_chooser_entry_activate_cb (EmpathyPresenceChooser *self,
+                                    GtkEntry               *entry)
 {
        presence_chooser_set_status_editing (self, FALSE);
        mc_set_custom_state (self);
 }
 
 static gboolean
-presence_chooser_entry_key_press_event_cb (EmpathyPresenceChooser      *self,
-                                           GdkEventKey                 *event,
-                                          GtkWidget                    *entry)
+presence_chooser_entry_key_press_event_cb (EmpathyPresenceChooser *self,
+                                           GdkEventKey            *event,
+                                          GtkWidget              *entry)
 {
        EmpathyPresenceChooserPriv *priv = GET_PRIV (self);
 
-       if (priv->editing_status && event->keyval == GDK_Escape)
-       {
+       if (priv->editing_status && event->keyval == GDK_Escape) {
                /* the user pressed Escape, undo the editing */
-               presence_chooser_set_status_editing (self, FALSE);
                presence_chooser_reset_status (self);
-
                return TRUE;
        }
-       else if (event->keyval == GDK_Up || event->keyval == GDK_Down)
-       {
+       else if (event->keyval == GDK_Up || event->keyval == GDK_Down) {
                /* ignore */
                return TRUE;
        }
@@ -399,8 +522,7 @@ presence_chooser_entry_button_press_event_cb (EmpathyPresenceChooser *self,
 
        if (!priv->editing_status &&
            event->button == 1 &&
-           !GTK_WIDGET_HAS_FOCUS (entry))
-       {
+           !GTK_WIDGET_HAS_FOCUS (entry)) {
                gtk_widget_grab_focus (entry);
                gtk_editable_select_region (GTK_EDITABLE (entry), 0, -1);
 
@@ -416,11 +538,12 @@ presence_chooser_entry_changed_cb (EmpathyPresenceChooser *self,
 {
        EmpathyPresenceChooserPriv *priv = GET_PRIV (self);
 
-       if (priv->block_changed) return;
+       if (priv->block_changed){
+               return;
+       }
 
        /* the combo is being edited to a custom entry */
-       if (!priv->editing_status)
-       {
+       if (!priv->editing_status) {
                presence_chooser_set_status_editing (self, TRUE);
        }
 }
@@ -429,96 +552,92 @@ static void
 presence_chooser_changed_cb (GtkComboBox *self, gpointer user_data)
 {
        EmpathyPresenceChooserPriv *priv = GET_PRIV (self);
-
-       if (priv->block_changed) return;
-
        GtkTreeIter iter;
        char *icon_name;
        McPresence new_state;
        gboolean customisable = TRUE;
-       int type = -1;
+       PresenceChooserEntryType type = -1;
+       GtkWidget *entry;
+       GtkTreeModel *model;
 
-       GtkTreeModel *model = gtk_combo_box_get_model (self);
-       if (!gtk_combo_box_get_active_iter (self, &iter))
-       {
+       if (priv->block_changed ||
+           !gtk_combo_box_get_active_iter (self, &iter)) {
                return;
        }
 
+       model = gtk_combo_box_get_model (self);
        gtk_tree_model_get (model, &iter,
-                       COL_STATE_ICON_NAME, &icon_name,
-                       COL_STATE, &new_state,
-                       COL_STATUS_CUSTOMISABLE, &customisable,
-                       COL_TYPE, &type,
-                       -1);
+                           COL_STATE_ICON_NAME, &icon_name,
+                           COL_STATE, &new_state,
+                           COL_STATUS_CUSTOMISABLE, &customisable,
+                           COL_TYPE, &type,
+                           -1);
 
-       GtkWidget *entry = gtk_bin_get_child (GTK_BIN (self));
+       entry = gtk_bin_get_child (GTK_BIN (self));
 
        /* some types of status aren't editable, set the editability of the
         * entry appropriately. Unless we're just about to reset it anyway,
         * in which case, don't fiddle with it */
-       if (type != ENTRY_TYPE_EDIT_CUSTOM)
-       {
+       if (type != ENTRY_TYPE_EDIT_CUSTOM) {
                gtk_editable_set_editable (GTK_EDITABLE (entry), customisable);
                priv->state = new_state;
        }
 
-       if (type == ENTRY_TYPE_EDIT_CUSTOM)
-       {
+       if (type == ENTRY_TYPE_EDIT_CUSTOM) {
+               GtkWidget *window, *dialog;
+
                presence_chooser_reset_status (EMPATHY_PRESENCE_CHOOSER (self));
 
                /* attempt to get the toplevel for this widget */
-               GtkWidget *window = gtk_widget_get_toplevel (GTK_WIDGET (self));
-               if (!GTK_WIDGET_TOPLEVEL (window) || !GTK_IS_WINDOW (window))
-               {
+               window = gtk_widget_get_toplevel (GTK_WIDGET (self));
+               if (!GTK_WIDGET_TOPLEVEL (window) || !GTK_IS_WINDOW (window)) {
                        window = NULL;
                }
 
-               presence_chooser_dialog_show (GTK_WINDOW (window));
+               dialog = empathy_status_preset_dialog_new (GTK_WINDOW (window));
+               gtk_dialog_run (GTK_DIALOG (dialog));
+               gtk_widget_destroy (dialog);
        }
-       else if (type == ENTRY_TYPE_CUSTOM)
-       {
+       else if (type == ENTRY_TYPE_CUSTOM) {
                gtk_entry_set_icon_from_icon_name (GTK_ENTRY (entry),
-                               GTK_ENTRY_ICON_PRIMARY,
-                               icon_name);
+                                                  GTK_ENTRY_ICON_PRIMARY,
+                                                  icon_name);
 
                /* preseed the status */
-               if (priv->previous_type == ENTRY_TYPE_BUILTIN)
-               {
+               if (priv->previous_type == ENTRY_TYPE_BUILTIN) {
                        /* if their previous entry was a builtin, don't
                         * preseed */
                        gtk_entry_set_text (GTK_ENTRY (entry), "");
-               }
-               else
-               {
+               } else {
                        /* else preseed the text of their currently entered
                         * status message */
-                       const char *status = empathy_idle_get_status (priv->idle);
+                       const char *status;
+
+                       status = empathy_idle_get_status (priv->idle);
                        gtk_entry_set_text (GTK_ENTRY (entry), status);
                }
 
                /* grab the focus */
                gtk_widget_grab_focus (entry);
-       }
-       else
-       {
+       } else {
                char *status;
+
                /* just in case we were setting a new status when
                 * things were changed */
                presence_chooser_set_status_editing (
-                               EMPATHY_PRESENCE_CHOOSER (self),
-                               FALSE);
+                       EMPATHY_PRESENCE_CHOOSER (self),
+                       FALSE);
 
                gtk_tree_model_get (model, &iter,
-                               COL_STATUS_TEXT, &status,
-                               -1);
+                                   COL_STATUS_TEXT, &status,
+                                   -1);
 
                empathy_idle_set_presence (priv->idle, priv->state, status);
 
                g_free (status);
        }
 
-       if (type != ENTRY_TYPE_EDIT_CUSTOM)
-       {
+       if (type != ENTRY_TYPE_EDIT_CUSTOM) {
                priv->previous_type = type;
        }
        g_free (icon_name);
@@ -529,10 +648,11 @@ combo_row_separator_func (GtkTreeModel    *model,
                          GtkTreeIter   *iter,
                          gpointer       data)
 {
-       int type;
+       PresenceChooserEntryType type;
+
        gtk_tree_model_get (model, iter,
-                       COL_TYPE, &type,
-                       -1);
+                           COL_TYPE, &type,
+                           -1);
 
        return (type == ENTRY_TYPE_SEPARATOR);
 }
@@ -540,10 +660,13 @@ combo_row_separator_func (GtkTreeModel    *model,
 static gboolean
 presence_chooser_entry_focus_out_idle_cb (gpointer user_data)
 {
+       EmpathyPresenceChooser *chooser;
+       GtkWidget *entry;
+
        DEBUG ("Autocommiting status message\n");
 
-       EmpathyPresenceChooser *chooser = EMPATHY_PRESENCE_CHOOSER (user_data);
-       GtkWidget *entry = gtk_bin_get_child (GTK_BIN (chooser));
+       chooser = EMPATHY_PRESENCE_CHOOSER (user_data);
+       entry = gtk_bin_get_child (GTK_BIN (chooser));
 
        presence_chooser_entry_activate_cb (chooser, GTK_ENTRY (entry));
 
@@ -557,8 +680,7 @@ presence_chooser_entry_focus_out_cb (EmpathyPresenceChooser *chooser,
 {
        EmpathyPresenceChooserPriv *priv = GET_PRIV (chooser);
 
-       if (priv->editing_status)
-       {
+       if (priv->editing_status) {
                /* this seems a bit evil and maybe it will be fragile,
                 * someone should think of a better way to do it.
                 *
@@ -572,8 +694,8 @@ presence_chooser_entry_focus_out_cb (EmpathyPresenceChooser *chooser,
                 * it will remove it, else the callback will commit the result.
                 */
                priv->focus_out_idle_source = g_idle_add (
-                               presence_chooser_entry_focus_out_idle_cb,
-                               chooser);
+                       presence_chooser_entry_focus_out_idle_cb,
+                       chooser);
        }
 
        gtk_editable_set_position (GTK_EDITABLE (entry), 0);
@@ -586,55 +708,51 @@ 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;
-       
-       GtkTreeModel *model = create_model ();
 
-       gtk_combo_box_set_model (GTK_COMBO_BOX (chooser), GTK_TREE_MODEL (model));
+       presence_chooser_create_model (chooser);
+
        gtk_combo_box_entry_set_text_column (GTK_COMBO_BOX_ENTRY (chooser),
-                       COL_STATUS_TEXT);
+                                            COL_STATUS_TEXT);
        gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (chooser),
-                       combo_row_separator_func,
-                       NULL, NULL);
-       
-       GtkWidget *entry = gtk_bin_get_child (GTK_BIN (chooser));
+                                             combo_row_separator_func,
+                                             NULL, NULL);
+
+       entry = gtk_bin_get_child (GTK_BIN (chooser));
        gtk_entry_set_icon_activatable (GTK_ENTRY (entry),
-                       GTK_ENTRY_ICON_PRIMARY, FALSE);
-       g_signal_connect_object (entry, "icon-release",
-                       G_CALLBACK (presence_chooser_entry_icon_release_cb),
-                       chooser,
-                       G_CONNECT_SWAPPED);
-       g_signal_connect_object (entry, "activate",
-                       G_CALLBACK (presence_chooser_entry_activate_cb),
-                       chooser,
-                       G_CONNECT_SWAPPED);
-       g_signal_connect_object (entry, "key-press-event",
-                       G_CALLBACK (presence_chooser_entry_key_press_event_cb),
-                       chooser,
-                       G_CONNECT_SWAPPED);
-       g_signal_connect_object (entry, "button-press-event",
-                       G_CALLBACK (presence_chooser_entry_button_press_event_cb),
-                       chooser,
-                       G_CONNECT_SWAPPED);
+                                       GTK_ENTRY_ICON_PRIMARY,
+                                       FALSE);
+
+       g_signal_connect_swapped (entry, "icon-release",
+               G_CALLBACK (presence_chooser_entry_icon_release_cb),
+               chooser);
+       g_signal_connect_swapped (entry, "activate",
+               G_CALLBACK (presence_chooser_entry_activate_cb),
+               chooser);
+       g_signal_connect_swapped (entry, "key-press-event",
+               G_CALLBACK (presence_chooser_entry_key_press_event_cb),
+               chooser);
+       g_signal_connect_swapped (entry, "button-press-event",
+               G_CALLBACK (presence_chooser_entry_button_press_event_cb),
+               chooser);
 
-       GtkCellRenderer *renderer;
        gtk_cell_layout_clear (GTK_CELL_LAYOUT (chooser));
 
        renderer = gtk_cell_renderer_pixbuf_new ();
        gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (chooser), renderer, FALSE);
        gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (chooser), renderer,
-                       "icon-name", COL_STATE_ICON_NAME,
-                       NULL);
+                                       "icon-name", COL_STATE_ICON_NAME,
+                                       NULL);
        g_object_set (renderer, "stock-size", GTK_ICON_SIZE_MENU, NULL);
 
        renderer = gtk_cell_renderer_text_new ();
        gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (chooser), renderer, TRUE);
        gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (chooser), renderer,
-                       "markup", COL_DISPLAY_MARKUP,
-                       NULL);
-
-       g_object_unref (model);
+                                       "markup", COL_DISPLAY_MARKUP,
+                                       NULL);
 
        g_signal_connect (chooser, "notify::popup-shown",
                        G_CALLBACK (presence_chooser_popup_shown_cb), NULL);
@@ -650,13 +768,12 @@ empathy_presence_chooser_init (EmpathyPresenceChooser *chooser)
        priv->idle = empathy_idle_dup_singleton ();
        presence_chooser_presence_changed_cb (chooser);
        g_signal_connect_swapped (priv->idle, "notify",
-                       G_CALLBACK (presence_chooser_presence_changed_cb),
-                       chooser);
+               G_CALLBACK (presence_chooser_presence_changed_cb),
+               chooser);
 
-       g_object_set (chooser,
-                       // FIXME: this string sucks
-                       "tooltip-text", _("Set your presence and current status"),
-                       NULL);
+       /* FIXME: this string sucks */
+       gtk_widget_set_tooltip_text (GTK_WIDGET (chooser),
+               _("Set your presence and current status"));
 }
 
 static void
@@ -682,6 +799,13 @@ presence_chooser_finalize (GObject *object)
        G_OBJECT_CLASS (empathy_presence_chooser_parent_class)->finalize (object);
 }
 
+/**
+ * empathy_presence_chooser_new:
+ *
+ * Creates a new #EmpathyPresenceChooser widget.
+ *
+ * Return value: A new #EmpathyPresenceChooser widget
+ */
 GtkWidget *
 empathy_presence_chooser_new (void)
 {
@@ -696,24 +820,28 @@ static void
 presence_chooser_presence_changed_cb (EmpathyPresenceChooser *chooser)
 {
        EmpathyPresenceChooserPriv *priv;
-       McPresence                 state;
-       McPresence                 flash_state;
-       const gchar               *status;
+       McPresence                  state;
+       McPresence                  flash_state;
+       const gchar                *status;
+       GtkTreeModel               *model;
+       GtkTreeIter                 iter;
+       gboolean valid, match_state = FALSE, match = FALSE;
 
        priv = GET_PRIV (chooser);
 
+       if (priv->editing_status) {
+               return;
+       }
+
        priv->state = state = empathy_idle_get_state (priv->idle);
        status = empathy_idle_get_status (priv->idle);
        flash_state = empathy_idle_get_flash_state (priv->idle);
 
        /* look through the model and attempt to find a matching state */
-       GtkTreeModel *model = gtk_combo_box_get_model (GTK_COMBO_BOX (chooser));
-       GtkTreeIter iter;
-       gboolean valid, match_state = FALSE, match = FALSE;
+       model = gtk_combo_box_get_model (GTK_COMBO_BOX (chooser));
        for (valid = gtk_tree_model_get_iter_first (model, &iter);
             valid;
-            valid = gtk_tree_model_iter_next (model, &iter))
-       {
+            valid = gtk_tree_model_iter_next (model, &iter)) {
                int m_type;
                McPresence m_state;
                char *m_status;
@@ -725,18 +853,15 @@ presence_chooser_presence_changed_cb (EmpathyPresenceChooser *chooser)
 
                if (m_type == ENTRY_TYPE_CUSTOM ||
                    m_type == ENTRY_TYPE_SEPARATOR ||
-                   m_type == ENTRY_TYPE_EDIT_CUSTOM)
-               {
+                   m_type == ENTRY_TYPE_EDIT_CUSTOM) {
                        continue;
                }
-               else if (!match_state && state == m_state)
-               {
+               else if (!match_state && state == m_state) {
                        /* we are now in the section that can contain our
                         * match */
                        match_state = TRUE;
                }
-               else if (match_state && state != m_state)
-               {
+               else if (match_state && state != m_state) {
                        /* we have passed the section that can contain our
                         * match */
                        break;
@@ -754,20 +879,20 @@ presence_chooser_presence_changed_cb (EmpathyPresenceChooser *chooser)
 
        }
 
-       if (match)
-       {
+       if (match) {
                priv->block_changed++;
                gtk_combo_box_set_active_iter (GTK_COMBO_BOX (chooser), &iter);
+               presence_chooser_set_favorite_icon (chooser);
                priv->block_changed--;
        }
-       else
-       {
+       else {
                ui_set_custom_state (chooser, state, status);
        }
 
        if (flash_state != MC_PRESENCE_UNSET) {
                presence_chooser_flash_start (chooser, state, flash_state);
-       } else {
+       }
+       else {
                presence_chooser_flash_stop (chooser, state);
        }
 }
@@ -776,21 +901,23 @@ static gboolean
 presence_chooser_flash_timeout_cb (EmpathyPresenceChooser *chooser)
 {
        EmpathyPresenceChooserPriv *priv;
-       McPresence                 state;
-       static gboolean            on = FALSE;
+       McPresence                  state;
+       static gboolean             on = FALSE;
+       GtkWidget                  *entry;
 
        priv = GET_PRIV (chooser);
 
        if (on) {
                state = priv->flash_state_1;
-       } else {
+       }
+       else {
                state = priv->flash_state_2;
        }
 
-       GtkWidget *entry = gtk_bin_get_child (GTK_BIN (chooser));
+       entry = gtk_bin_get_child (GTK_BIN (chooser));
        gtk_entry_set_icon_from_icon_name (GTK_ENTRY (entry),
-                       GTK_ENTRY_ICON_PRIMARY,
-                       empathy_icon_name_for_presence (state));
+                                          GTK_ENTRY_ICON_PRIMARY,
+                                          empathy_icon_name_for_presence (state));
 
        on = !on;
 
@@ -799,8 +926,8 @@ presence_chooser_flash_timeout_cb (EmpathyPresenceChooser *chooser)
 
 static void
 presence_chooser_flash_start (EmpathyPresenceChooser *chooser,
-                             McPresence             state_1,
-                             McPresence             state_2)
+                             McPresence              state_1,
+                             McPresence              state_2)
 {
        EmpathyPresenceChooserPriv *priv;
 
@@ -813,8 +940,8 @@ presence_chooser_flash_start (EmpathyPresenceChooser *chooser,
 
        if (!priv->flash_timeout_id) {
                priv->flash_timeout_id = g_timeout_add (FLASH_TIMEOUT,
-                                                       (GSourceFunc) presence_chooser_flash_timeout_cb,
-                                                       chooser);
+                       (GSourceFunc) presence_chooser_flash_timeout_cb,
+                       chooser);
        }
 }
 
@@ -822,26 +949,27 @@ static void
 presence_chooser_flash_stop (EmpathyPresenceChooser *chooser,
                             McPresence             state)
 {
-       EmpathyPresenceChooserPriv *priv;
-
-       g_return_if_fail (EMPATHY_IS_PRESENCE_CHOOSER (chooser));
-
-       priv = GET_PRIV (chooser);
+       EmpathyPresenceChooserPriv *priv = GET_PRIV (chooser);
+       GtkWidget *entry;
 
        if (priv->flash_timeout_id) {
                g_source_remove (priv->flash_timeout_id);
                priv->flash_timeout_id = 0;
        }
-       GtkWidget *entry = gtk_bin_get_child (GTK_BIN (chooser));
-       
-       gtk_entry_set_icon_from_icon_name (GTK_ENTRY (entry),
-                       GTK_ENTRY_ICON_PRIMARY,
-                       empathy_icon_name_for_presence (state));
 
-       // FIXME - what does this do?
-       // priv->last_state = state;
+       entry = gtk_bin_get_child (GTK_BIN (chooser));
+       gtk_entry_set_icon_from_icon_name (GTK_ENTRY (entry),
+                                          GTK_ENTRY_ICON_PRIMARY,
+                                          empathy_icon_name_for_presence (state));
 }
 
+/**
+ * empathy_presence_chooser_create_menu:
+ *
+ * Creates a new #GtkMenu allowing users to change their presence from a menu.
+ *
+ * Return value: a new #GtkMenu for changing presence in a menu.
+ */
 GtkWidget *
 empathy_presence_chooser_create_menu (void)
 {
@@ -874,7 +1002,7 @@ empathy_presence_chooser_create_menu (void)
 
        }
 
-       /* Separator. */
+       /* Separator */
        item = gtk_menu_item_new ();
        gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
        gtk_widget_show (item);
@@ -954,224 +1082,9 @@ static void
 presence_chooser_custom_activate_cb (GtkWidget *item,
                                     gpointer   user_data)
 {
-       presence_chooser_dialog_show (NULL);
-}
-
-static McPresence
-presence_chooser_dialog_get_selected (CustomMessageDialog *dialog)
-{
-       GtkTreeModel *model;
-       GtkTreeIter   iter;
-       McPresence    presence = LAST_MC_PRESENCE;
-
-       model = gtk_combo_box_get_model (GTK_COMBO_BOX (dialog->combobox_status));
-       if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (dialog->combobox_status), &iter)) {
-               gtk_tree_model_get (model, &iter,
-                                   COL_PRESENCE, &presence,
-                                   -1);
-       }
-
-       return presence;
-}
-
-static void
-presence_chooser_dialog_status_changed_cb (GtkWidget           *widget,
-                                          CustomMessageDialog *dialog)
-{
-       GtkListStore *store;
-       GtkTreeIter   iter;
-       McPresence    presence = LAST_MC_PRESENCE;
-       GList        *messages, *l;
-
-       presence = presence_chooser_dialog_get_selected (dialog);
-
-       store = gtk_list_store_new (1, G_TYPE_STRING);
-       messages = empathy_status_presets_get (presence, -1);
-       for (l = messages; l; l = l->next) {
-               gtk_list_store_append (store, &iter);
-               gtk_list_store_set (store, &iter, 0, l->data, -1);
-       }
-
-       gtk_entry_set_text (GTK_ENTRY (dialog->entry_message),
-                           messages ? messages->data : "");
-
-       g_list_free (messages);
-
-       gtk_combo_box_set_model (GTK_COMBO_BOX (dialog->comboboxentry_message),
-                                GTK_TREE_MODEL (store));
-
-       g_object_unref (store);
-}
+       GtkWidget *dialog;
 
-static void
-presence_chooser_dialog_message_changed_cb (GtkWidget           *widget,
-                                           CustomMessageDialog *dialog)
-{
-       McPresence   presence;
-       GList       *messages, *l;
-       const gchar *text;
-       gboolean     found = FALSE;
-
-       presence = presence_chooser_dialog_get_selected (dialog);
-       text = gtk_entry_get_text (GTK_ENTRY (dialog->entry_message));
-
-       messages = empathy_status_presets_get (presence, -1);
-       for (l = messages; l; l = l->next) {
-               if (!tp_strdiff (text, l->data)) {
-                       found = TRUE;
-                       break;
-               }
-       }
-       g_list_free (messages);
-
-       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dialog->checkbutton_save),
-                                     found);
+       dialog = empathy_status_preset_dialog_new (NULL);
+       gtk_dialog_run (GTK_DIALOG (dialog));
+       gtk_widget_destroy (dialog);
 }
-
-static void
-presence_chooser_dialog_save_toggled_cb (GtkWidget           *widget,
-                                        CustomMessageDialog *dialog)
-{
-       gboolean     active;
-       McPresence   state;
-       const gchar *text;
-
-       active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog->checkbutton_save));
-       state = presence_chooser_dialog_get_selected (dialog);
-       text = gtk_entry_get_text (GTK_ENTRY (dialog->entry_message));
-
-       if (active) {
-               empathy_status_presets_set_last (state, text);
-       } else {
-               empathy_status_presets_remove (state, text);
-       }
-}
-
-static void
-presence_chooser_dialog_setup (CustomMessageDialog *dialog)
-{
-       GtkListStore    *store;
-       GtkCellRenderer *renderer;
-       GtkTreeIter      iter;
-       guint            i;
-
-       store = gtk_list_store_new (COL_COUNT,
-                                   G_TYPE_STRING,     /* Icon name */
-                                   G_TYPE_STRING,     /* Label     */
-                                   MC_TYPE_PRESENCE); /* Presence   */
-       gtk_combo_box_set_model (GTK_COMBO_BOX (dialog->combobox_status),
-                                GTK_TREE_MODEL (store));
-
-       renderer = gtk_cell_renderer_pixbuf_new ();
-       gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (dialog->combobox_status), renderer, FALSE);
-       gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (dialog->combobox_status), renderer,
-                                       "icon-name", COL_ICON,
-                                       NULL);
-       g_object_set (renderer, "stock-size", GTK_ICON_SIZE_BUTTON, NULL);
-
-       renderer = gtk_cell_renderer_text_new ();
-       gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (dialog->combobox_status), renderer, TRUE);
-       gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (dialog->combobox_status), renderer,
-                                       "text", COL_LABEL,
-                                       NULL);
-
-       for (i = 0; i < G_N_ELEMENTS (states); i += 2) {
-               if (!states[i+1]) {
-                       continue;
-               }
-
-               gtk_list_store_append (store, &iter);
-               gtk_list_store_set (store, &iter,
-                                   COL_ICON, empathy_icon_name_for_presence (states[i]),
-                                   COL_LABEL, empathy_presence_get_default_message (states[i]),
-                                   COL_PRESENCE, states[i],
-                                   -1);
-       }
-
-       gtk_combo_box_set_active (GTK_COMBO_BOX (dialog->combobox_status), 0);
-}
-
-static void
-presence_chooser_dialog_response_cb (GtkWidget           *widget,
-                                    gint                 response,
-                                    CustomMessageDialog *dialog)
-{
-       if (response == GTK_RESPONSE_APPLY) {
-               McPresence   state;
-               const gchar *text;
-
-               state = presence_chooser_dialog_get_selected (dialog);
-               text = gtk_entry_get_text (GTK_ENTRY (dialog->entry_message));
-
-               presence_chooser_set_state (state, text);
-       }
-
-       gtk_widget_destroy (widget);
-}
-
-static void
-presence_chooser_dialog_destroy_cb (GtkWidget           *widget,
-                                   CustomMessageDialog *dialog)
-{
-
-       g_free (dialog);
-       message_dialog = NULL;
-}
-
-static void
-presence_chooser_dialog_show (GtkWindow *parent)
-{
-       GladeXML *glade;
-       gchar    *filename;
-
-       if (message_dialog) {
-               gtk_window_present (GTK_WINDOW (message_dialog->dialog));
-               return;
-       }
-
-       message_dialog = g_new0 (CustomMessageDialog, 1);
-
-       filename = empathy_file_lookup ("empathy-presence-chooser.glade",
-                                       "libempathy-gtk");
-       glade = empathy_glade_get_file (filename,
-                                      "custom_message_dialog",
-                                      NULL,
-                                      "custom_message_dialog", &message_dialog->dialog,
-                                      "checkbutton_save", &message_dialog->checkbutton_save,
-                                      "comboboxentry_message", &message_dialog->comboboxentry_message,
-                                      "combobox_status", &message_dialog->combobox_status,
-                                      NULL);
-       g_free (filename);
-
-       empathy_glade_connect (glade,
-                              message_dialog,
-                              "custom_message_dialog", "destroy", presence_chooser_dialog_destroy_cb,
-                              "custom_message_dialog", "response", presence_chooser_dialog_response_cb,
-                              "combobox_status", "changed", presence_chooser_dialog_status_changed_cb,
-                              "checkbutton_save", "toggled", presence_chooser_dialog_save_toggled_cb,
-                              NULL);
-
-       g_object_unref (glade);
-
-       /* Setup the message combobox */
-       message_dialog->entry_message = GTK_BIN (message_dialog->comboboxentry_message)->child;
-       gtk_entry_set_activates_default (GTK_ENTRY (message_dialog->entry_message), TRUE);
-       gtk_entry_set_width_chars (GTK_ENTRY (message_dialog->entry_message), 25);
-       g_signal_connect (message_dialog->entry_message, "changed",
-                         G_CALLBACK (presence_chooser_dialog_message_changed_cb),
-                         message_dialog);
-
-       presence_chooser_dialog_setup (message_dialog);
-
-       gtk_combo_box_entry_set_text_column (GTK_COMBO_BOX_ENTRY (message_dialog->comboboxentry_message), 0);
-
-       if (parent)
-       {
-               gtk_window_set_transient_for (
-                               GTK_WINDOW (message_dialog->dialog),
-                               parent);
-       }
-
-       gtk_widget_show_all (message_dialog->dialog);
-}
-