]> git.0d.be Git - empathy.git/blobdiff - libempathy-gtk/empathy-presence-chooser.c
Coding style fixes
[empathy.git] / libempathy-gtk / empathy-presence-chooser.c
index f3097abcea766d806c803e63bb85cc45eac10ac7..672cd981a5d6cb0868eb0ecff283de806f23a801 100644 (file)
@@ -1,6 +1,7 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  * Copyright (C) 2005-2007 Imendio AB
+ * Copyright (C) 2009 Collabora Ltd.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -19,6 +20,8 @@
  *
  * Authors: Richard Hult <richard@imendio.com>
  *          Martyn Russell <martyn@imendio.com>
+ *          Xavier Claessens <xclaesse@gmail.com>
+ *          Davyd Madeley <davyd.madeley@collabora.co.uk>
  */
 
 #include "config.h"
 #include <string.h>
 #include <stdlib.h>
 
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 #include <glade/glade.h>
+#include <gdk/gdkkeysyms.h>
 
+#include <telepathy-glib/util.h>
 #include <libmissioncontrol/mc-enum-types.h>
 
 #include <libempathy/empathy-idle.h>
 #include <libempathy/empathy-utils.h>
+#include <libempathy/empathy-status-presets.h>
+
+#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include <libempathy/empathy-debug.h>
-#include <libempathy/empathy-marshal.h>
 
 #include "empathy-ui-utils.h"
 #include "empathy-images.h"
 #include "empathy-presence-chooser.h"
-#include "empathy-status-presets.h"
-
-#define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EMPATHY_TYPE_PRESENCE_CHOOSER, EmpathyPresenceChooserPriv))
-
-#define DEBUG_DOMAIN "PresenceChooser"
 
 /* Flashing delay for icons (milliseconds). */
 #define FLASH_TIMEOUT 500
 
+#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyPresenceChooser)
 typedef struct {
        EmpathyIdle *idle;
 
-       GtkWidget   *hbox;
-       GtkWidget   *image;
-       GtkWidget   *label;
-       GtkWidget   *menu;
+       gboolean     editing_status;
+       int          block_set_editing;
+       int          block_changed;
+       guint        focus_out_idle_source;
 
-       McPresence   last_state;
+       McPresence   state;
+       int          previous_type;
 
        McPresence   flash_state_1;
        McPresence   flash_state_2;
        guint        flash_timeout_id;
-
-       /* The handle the kind of unnessecary scroll support. */
-       guint        scroll_timeout_id;
-       McPresence   scroll_state;
-       gchar       *scroll_status;
 } EmpathyPresenceChooserPriv;
 
 typedef struct {
@@ -85,11 +84,6 @@ enum {
        COL_COUNT
 };
 
-typedef struct {
-       McPresence   state;
-       const gchar *status;
-} StateAndStatus;
-
 static CustomMessageDialog *message_dialog = NULL;
 /* States to be listed in the menu.
  * Each state has a boolean telling if it can have custom message */
@@ -99,42 +93,14 @@ static guint states[] = {MC_PRESENCE_AVAILABLE, TRUE,
                         MC_PRESENCE_HIDDEN, FALSE,
                         MC_PRESENCE_OFFLINE, FALSE};
 
-static void            empathy_presence_chooser_class_init      (EmpathyPresenceChooserClass *klass);
-static void            empathy_presence_chooser_init            (EmpathyPresenceChooser      *chooser);
 static void            presence_chooser_finalize               (GObject                    *object);
 static void            presence_chooser_presence_changed_cb    (EmpathyPresenceChooser      *chooser);
-static void            presence_chooser_reset_scroll_timeout   (EmpathyPresenceChooser      *chooser);
-static gboolean        presence_chooser_scroll_timeout_cb      (EmpathyPresenceChooser      *chooser);
-static gboolean        presence_chooser_scroll_event_cb        (EmpathyPresenceChooser      *chooser,
-                                                               GdkEventScroll             *event,
-                                                               gpointer                    user_data);
-static GList *         presence_chooser_get_presets            (EmpathyPresenceChooser      *chooser);
-static StateAndStatus *presence_chooser_state_and_status_new   (McPresence                  state,
-                                                               const gchar                *status);
 static gboolean        presence_chooser_flash_timeout_cb       (EmpathyPresenceChooser      *chooser);
 static void            presence_chooser_flash_start            (EmpathyPresenceChooser      *chooser,
                                                                McPresence                  state_1,
                                                                McPresence                  state_2);
 static void            presence_chooser_flash_stop             (EmpathyPresenceChooser      *chooser,
                                                                McPresence                  state);
-static gboolean        presence_chooser_button_press_event_cb  (GtkWidget                  *chooser,
-                                                               GdkEventButton             *event,
-                                                               gpointer                    user_data);
-static void            presence_chooser_toggled_cb             (GtkWidget                  *chooser,
-                                                               gpointer                    user_data);
-static void            presence_chooser_menu_popup             (EmpathyPresenceChooser      *chooser);
-static void            presence_chooser_menu_popdown           (EmpathyPresenceChooser      *chooser);
-static void            presence_chooser_menu_selection_done_cb (GtkMenuShell               *menushell,
-                                                               EmpathyPresenceChooser      *chooser);
-static void            presence_chooser_menu_destroy_cb        (GtkWidget                  *menu,
-                                                               EmpathyPresenceChooser      *chooser);
-static void            presence_chooser_menu_detach            (GtkWidget                  *attach_widget,
-                                                               GtkMenu                    *menu);
-static void            presence_chooser_menu_align_func        (GtkMenu                    *menu,
-                                                               gint                       *x,
-                                                               gint                       *y,
-                                                               gboolean                   *push_in,
-                                                               GtkWidget                  *widget);
 static void            presence_chooser_menu_add_item          (GtkWidget                  *menu,
                                                                const gchar                *str,
                                                                McPresence                  state);
@@ -144,9 +110,9 @@ 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            (void);
+static void            presence_chooser_dialog_show            (GtkWindow                  *parent);
 
-G_DEFINE_TYPE (EmpathyPresenceChooser, empathy_presence_chooser, GTK_TYPE_TOGGLE_BUTTON);
+G_DEFINE_TYPE (EmpathyPresenceChooser, empathy_presence_chooser, GTK_TYPE_COMBO_BOX_ENTRY);
 
 static void
 empathy_presence_chooser_class_init (EmpathyPresenceChooserClass *klass)
@@ -158,495 +124,713 @@ empathy_presence_chooser_class_init (EmpathyPresenceChooserClass *klass)
        g_type_class_add_private (object_class, sizeof (EmpathyPresenceChooserPriv));
 }
 
-static void
-empathy_presence_chooser_init (EmpathyPresenceChooser *chooser)
+enum
 {
-       EmpathyPresenceChooserPriv *priv;
-       GtkWidget                 *arrow;
-       GtkWidget                 *alignment;
+       COL_STATE_ICON_NAME,
+       COL_STATE,
+       COL_STATUS_TEXT,
+       COL_DISPLAY_MARKUP,
+       COL_STATUS_CUSTOMISABLE,
+       COL_TYPE,
+       N_COLUMNS
+};
 
-       priv = GET_PRIV (chooser);
+enum
+{
+       ENTRY_TYPE_BUILTIN,
+       ENTRY_TYPE_SAVED,
+       ENTRY_TYPE_CUSTOM,
+       ENTRY_TYPE_SEPARATOR,
+       ENTRY_TYPE_EDIT_CUSTOM,
+};
 
-       gtk_button_set_relief (GTK_BUTTON (chooser), GTK_RELIEF_NONE);
-       gtk_button_set_focus_on_click (GTK_BUTTON (chooser), FALSE);
+static GtkTreeModel *
+presence_chooser_create_model (void)
+{
+       GtkListStore *store;
+       char *custom_message;
 
-       alignment = gtk_alignment_new (0.5, 0.5, 1, 1);
-       gtk_widget_show (alignment);
-       gtk_container_add (GTK_CONTAINER (chooser), alignment);
-       gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 0, 0, 1, 0);
+       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 */
 
-       priv->hbox = gtk_hbox_new (FALSE, 1);
-       gtk_widget_show (priv->hbox);
-       gtk_container_add (GTK_CONTAINER (alignment), priv->hbox);
+       custom_message = g_strdup_printf ("<i>%s</i>", _("Custom Message..."));
 
-       priv->image = gtk_image_new ();
-       gtk_widget_show (priv->image);
-       gtk_box_pack_start (GTK_BOX (priv->hbox), priv->image, FALSE, TRUE, 0);
+       int i;
+       for (i = 0; i < G_N_ELEMENTS (states); i += 2) {
+               GList       *list, *l;
+               const char *status, *icon_name;
 
-       priv->label = gtk_label_new (NULL);
-       gtk_widget_show (priv->label);
-       gtk_box_pack_start (GTK_BOX (priv->hbox), priv->label, TRUE, TRUE, 0);
-       gtk_label_set_ellipsize (GTK_LABEL (priv->label), PANGO_ELLIPSIZE_END);
-       gtk_misc_set_alignment (GTK_MISC (priv->label), 0, 0.5);
-       gtk_misc_set_padding (GTK_MISC (priv->label), 4, 1);
+               status = empathy_presence_get_default_message (states[i]);
+               icon_name = empathy_icon_name_for_presence (states[i]);
 
-       alignment = gtk_alignment_new (0.5, 0.5, 1, 1);
-       gtk_widget_show (alignment);
-       gtk_box_pack_start (GTK_BOX (priv->hbox), alignment, FALSE, FALSE, 0);
+               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);
 
-       arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_OUT);
-       gtk_widget_show (arrow);
-       gtk_container_add (GTK_CONTAINER (alignment), arrow);
+               if (states[i+1]) {
 
-       g_signal_connect (chooser, "toggled",
-                         G_CALLBACK (presence_chooser_toggled_cb),
-                         NULL);
-       g_signal_connect (chooser, "button-press-event",
-                         G_CALLBACK (presence_chooser_button_press_event_cb),
-                         NULL);
-       g_signal_connect (chooser, "scroll-event",
-                         G_CALLBACK (presence_chooser_scroll_event_cb),
-                         NULL);
+                       /* Set custom messages if wanted */
+                       list = empathy_status_presets_get (states[i], 5);
+                       for (l = list; l; l = l->next) {
+                               gtk_list_store_insert_with_values (store,
+                                               NULL, -1,
+                                               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);
 
-       priv->idle = empathy_idle_new ();
-       presence_chooser_presence_changed_cb (chooser);
-       g_signal_connect_swapped (priv->idle, "notify",
-                                 G_CALLBACK (presence_chooser_presence_changed_cb),
-                                 chooser);
+                       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_insert_with_values (store, NULL, -1,
+                       COL_TYPE, ENTRY_TYPE_SEPARATOR,
+                       -1);
+
+       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);
+
+       return GTK_TREE_MODEL (store);
 }
 
 static void
-presence_chooser_finalize (GObject *object)
+presence_chooser_popup_shown_cb (GObject *self,
+                                 GParamSpec *pspec,
+                                gpointer user_data)
 {
-       EmpathyPresenceChooserPriv *priv;
+       EmpathyPresenceChooserPriv *priv = GET_PRIV (self);
+       gboolean shown;
 
-       priv = GET_PRIV (object);
+       g_object_get (self, "popup-shown", &shown, NULL);
 
-       if (priv->flash_timeout_id) {
-               g_source_remove (priv->flash_timeout_id);
-       }
+       if (!shown) return;
 
-       if (priv->scroll_timeout_id) {
-               g_source_remove (priv->scroll_timeout_id);
+       /* see presence_chooser_entry_focus_out_cb() for what this does */
+       if (priv->focus_out_idle_source != 0)
+       {
+               g_source_remove (priv->focus_out_idle_source);
+               priv->focus_out_idle_source = 0;
        }
 
-       g_signal_handlers_disconnect_by_func (priv->idle,
-                                             presence_chooser_presence_changed_cb,
-                                             object);
-       g_object_unref (priv->idle);
+       GtkTreeModel *model = presence_chooser_create_model ();
 
-       G_OBJECT_CLASS (empathy_presence_chooser_parent_class)->finalize (object);
+       gtk_combo_box_set_model (GTK_COMBO_BOX (self), GTK_TREE_MODEL (model));
+
+       g_object_unref (model);
 }
 
-GtkWidget *
-empathy_presence_chooser_new (void)
+static void
+presence_chooser_set_status_editing (EmpathyPresenceChooser *self,
+                                     gboolean editing)
 {
-       GtkWidget *chooser;
+       EmpathyPresenceChooserPriv *priv = GET_PRIV (self);
+       GtkWidget *entry = gtk_bin_get_child (GTK_BIN (self));
+
+       if (priv->block_set_editing) return;
+
+       if (editing) {
+               priv->editing_status = TRUE;
+
+               gtk_entry_set_icon_from_stock (GTK_ENTRY (entry),
+                               GTK_ENTRY_ICON_SECONDARY,
+                               GTK_STOCK_OK);
+               gtk_entry_set_icon_tooltip_text (GTK_ENTRY (entry),
+                               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_set_icon_sensitive (GTK_ENTRY (entry),
+                               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)) {
+                       /* unset the focus */
+                       gtk_window_set_focus (GTK_WINDOW (window), NULL);
+               }
 
-       chooser = g_object_new (EMPATHY_TYPE_PRESENCE_CHOOSER, NULL);
+               /* see presence_chooser_entry_focus_out_cb()
+                * for what this does */
+               if (priv->focus_out_idle_source != 0) {
+                       g_source_remove (priv->focus_out_idle_source);
+                       priv->focus_out_idle_source = 0;
+               }
 
-       return chooser;
+               gtk_editable_set_position (GTK_EDITABLE (entry), 0);
+
+               priv->editing_status = FALSE;
+       }
 }
 
 static void
-presence_chooser_presence_changed_cb (EmpathyPresenceChooser *chooser)
+mc_set_custom_state (EmpathyPresenceChooser *self)
 {
-       EmpathyPresenceChooserPriv *priv;
-       McPresence                 state;
-       McPresence                 flash_state;
-       const gchar               *status;
+       EmpathyPresenceChooserPriv *priv = GET_PRIV (self);
+       GtkWidget *entry;
+       const char *status;
+
+       entry = gtk_bin_get_child (GTK_BIN (self));
+       /* update the status with MC */
+       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);
+       empathy_idle_set_presence (priv->idle, priv->state, status);
+}
 
-       priv = GET_PRIV (chooser);
+static void
+ui_set_custom_state (EmpathyPresenceChooser *self,
+                          McPresence state,
+                          const char *status)
+{
+       EmpathyPresenceChooserPriv *priv = GET_PRIV (self);
+       GtkWidget *entry;
+       const char *icon_name;
 
-       state = empathy_idle_get_state (priv->idle);
-       status = empathy_idle_get_status (priv->idle);
-       flash_state = empathy_idle_get_flash_state (priv->idle);
+       entry = gtk_bin_get_child (GTK_BIN (self));
 
-       presence_chooser_reset_scroll_timeout (chooser);
-       gtk_label_set_text (GTK_LABEL (priv->label), status);
+       priv->block_set_editing++;
+       priv->block_changed++;
 
-       if (flash_state != MC_PRESENCE_UNSET) {
-               presence_chooser_flash_start (chooser, state, flash_state);
-       } else {
-               presence_chooser_flash_stop (chooser, state);
-       }
+       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_set_text (GTK_ENTRY (entry), status);
+
+       priv->block_changed--;
+       priv->block_set_editing--;
 }
 
 static void
-presence_chooser_reset_scroll_timeout (EmpathyPresenceChooser *chooser)
+presence_chooser_reset_status (EmpathyPresenceChooser *self)
 {
-       EmpathyPresenceChooserPriv *priv;
-
-       priv = GET_PRIV (chooser);
+       /* recover the status that was unset */
+       presence_chooser_presence_changed_cb (self);
+       presence_chooser_set_status_editing (self, FALSE);
+}
 
-       if (priv->scroll_timeout_id) {
-               g_source_remove (priv->scroll_timeout_id);
-               priv->scroll_timeout_id = 0;
-       }
+static void
+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);
+}
 
-       g_free (priv->scroll_status);
-       priv->scroll_status = NULL;
+static void
+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_scroll_timeout_cb (EmpathyPresenceChooser *chooser)
+presence_chooser_entry_key_press_event_cb (EmpathyPresenceChooser      *self,
+                                           GdkEventKey                 *event,
+                                          GtkWidget                    *entry)
 {
-       EmpathyPresenceChooserPriv *priv;
+       EmpathyPresenceChooserPriv *priv = GET_PRIV (self);
 
-       priv = GET_PRIV (chooser);
+       if (priv->editing_status && event->keyval == GDK_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) {
+               /* ignore */
+               return TRUE;
+       }
 
-       priv->scroll_timeout_id = 0;
+       return FALSE; /* send this event elsewhere */
+}
+
+static gboolean
+presence_chooser_entry_button_press_event_cb (EmpathyPresenceChooser *self,
+                                              GdkEventButton         *event,
+                                             GtkWidget              *entry)
+{
+       EmpathyPresenceChooserPriv *priv = GET_PRIV (self);
 
-       empathy_idle_set_presence (priv->idle,
-                                  priv->scroll_state,
-                                  priv->scroll_status);
+       if (!priv->editing_status &&
+           event->button == 1 &&
+           !GTK_WIDGET_HAS_FOCUS (entry)) {
+               gtk_widget_grab_focus (entry);
+               gtk_editable_select_region (GTK_EDITABLE (entry), 0, -1);
 
-       g_free (priv->scroll_status);
-       priv->scroll_status = NULL;
+               return TRUE;
+       }
 
        return FALSE;
 }
 
-static gboolean
-presence_chooser_scroll_event_cb (EmpathyPresenceChooser *chooser,
-                                 GdkEventScroll        *event,
-                                 gpointer               user_data)
+static void
+presence_chooser_entry_changed_cb (EmpathyPresenceChooser *self,
+                                  GtkEntry               *entry)
 {
-       EmpathyPresenceChooserPriv *priv;
-       GList                     *list, *l;
-       const gchar               *current_status;
-       StateAndStatus            *sas;
-       gboolean                   match;
+       EmpathyPresenceChooserPriv *priv = GET_PRIV (self);
 
-       priv = GET_PRIV (chooser);
+       if (priv->block_changed) return;
 
-       switch (event->direction) {
-       case GDK_SCROLL_UP:
-               break;
-       case GDK_SCROLL_DOWN:
-               break;
-       default:
-               return FALSE;
-       }
-
-       current_status = gtk_label_get_text (GTK_LABEL (priv->label));
-
-       /* Get the list of presets, which in this context means all the items
-        * without a trailing "...".
-        */
-       list = presence_chooser_get_presets (chooser);
-       sas = NULL;
-       match = FALSE;
-       for (l = list; l; l = l->next) {
-               sas = l->data;
-
-               if (sas->state == priv->last_state &&
-                   strcmp (sas->status, current_status) == 0) {
-                       sas = NULL;
-                       match = TRUE;
-                       if (event->direction == GDK_SCROLL_UP) {
-                               if (l->prev) {
-                                       sas = l->prev->data;
-                               }
-                       }
-                       else if (event->direction == GDK_SCROLL_DOWN) {
-                               if (l->next) {
-                                       sas = l->next->data;
-                               }
-                       }
-                       break;
-               }
-
-               sas = NULL;
+       /* the combo is being edited to a custom entry */
+       if (!priv->editing_status) {
+               presence_chooser_set_status_editing (self, TRUE);
        }
+}
 
-       if (sas) {
-               presence_chooser_reset_scroll_timeout (chooser);
+static void
+presence_chooser_changed_cb (GtkComboBox *self, gpointer user_data)
+{
+       EmpathyPresenceChooserPriv *priv = GET_PRIV (self);
 
-               priv->scroll_status = g_strdup (sas->status);
-               priv->scroll_state = sas->state;
+       if (priv->block_changed) return;
 
-               priv->scroll_timeout_id =
-                       g_timeout_add (500,
-                                      (GSourceFunc) presence_chooser_scroll_timeout_cb,
-                                      chooser);
+       GtkTreeIter iter;
+       char *icon_name;
+       McPresence new_state;
+       gboolean customisable = TRUE;
+       int type = -1;
+       GtkWidget *entry;
 
-               presence_chooser_flash_stop (chooser, sas->state);
-               gtk_label_set_text (GTK_LABEL (priv->label), sas->status);      
+       GtkTreeModel *model = gtk_combo_box_get_model (self);
+       if (!gtk_combo_box_get_active_iter (self, &iter)) {
+               return;
        }
-       else if (!match) {
-               const gchar *status;
-               /* If we didn't get any match at all, it means the last state
-                * was a custom one. Just switch to the first one.
-                */
-               status = empathy_presence_state_get_default_status (states[0]);
 
-               presence_chooser_reset_scroll_timeout (chooser);
-               empathy_idle_set_presence (priv->idle, states[0], status);
+       gtk_tree_model_get (model, &iter,
+                       COL_STATE_ICON_NAME, &icon_name,
+                       COL_STATE, &new_state,
+                       COL_STATUS_CUSTOMISABLE, &customisable,
+                       COL_TYPE, &type,
+                       -1);
+
+       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) {
+               gtk_editable_set_editable (GTK_EDITABLE (entry), customisable);
+               priv->state = new_state;
        }
 
-       g_list_foreach (list, (GFunc) g_free, NULL);
-       g_list_free (list);
+       if (type == ENTRY_TYPE_EDIT_CUSTOM) {
+               presence_chooser_reset_status (EMPATHY_PRESENCE_CHOOSER (self));
 
-       return 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 = NULL;
+               }
 
-static GList *
-presence_chooser_get_presets (EmpathyPresenceChooser *chooser)
-{
-       GList      *list = NULL;
-       guint       i;
+               presence_chooser_dialog_show (GTK_WINDOW (window));
+       }
+       else if (type == ENTRY_TYPE_CUSTOM) {
+               gtk_entry_set_icon_from_icon_name (GTK_ENTRY (entry),
+                               GTK_ENTRY_ICON_PRIMARY,
+                               icon_name);
+
+               /* preseed the status */
+               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 preseed the text of their currently entered
+                        * status message */
+                       const char *status;
 
-       for (i = 0; i < G_N_ELEMENTS (states); i += 2) {
-               GList          *presets, *p;
-               StateAndStatus *sas;
-               const gchar    *status;
+                       status = empathy_idle_get_status (priv->idle);
+                       gtk_entry_set_text (GTK_ENTRY (entry), status);
+               }
 
-               status = empathy_presence_state_get_default_status (states[i]);
-               sas = presence_chooser_state_and_status_new (states[i], status);
-               list = g_list_prepend (list, sas);
+               /* grab the focus */
+               gtk_widget_grab_focus (entry);
+       }
+       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);
 
-               /* Go to next state if we don't want messages for that state */
-               if (!states[i+1]) {
-                       continue;
-               }
+               gtk_tree_model_get (model, &iter,
+                               COL_STATUS_TEXT, &status,
+                               -1);
 
-               presets = empathy_status_presets_get (states[i], 5);
-               for (p = presets; p; p = p->next) {
-                       sas = presence_chooser_state_and_status_new (states[i], p->data);
-                       list = g_list_prepend (list, sas);
-               }
-               g_list_free (presets);
+               empathy_idle_set_presence (priv->idle, priv->state, status);
+
+               g_free (status);
        }
-       list = g_list_reverse (list);
 
-       return list;
+       if (type != ENTRY_TYPE_EDIT_CUSTOM) {
+               priv->previous_type = type;
+       }
+       g_free (icon_name);
 }
 
-static StateAndStatus *
-presence_chooser_state_and_status_new (McPresence   state,
-                                      const gchar *status)
+static gboolean
+combo_row_separator_func (GtkTreeModel *model,
+                         GtkTreeIter   *iter,
+                         gpointer       data)
 {
-       StateAndStatus *sas;
+       int type;
+       gtk_tree_model_get (model, iter,
+                       COL_TYPE, &type,
+                       -1);
 
-       sas = g_new0 (StateAndStatus, 1);
-
-       sas->state = state;
-       sas->status = status;
-
-       return sas;
+       return (type == ENTRY_TYPE_SEPARATOR);
 }
 
 static gboolean
-presence_chooser_flash_timeout_cb (EmpathyPresenceChooser *chooser)
+presence_chooser_entry_focus_out_idle_cb (gpointer user_data)
 {
-       EmpathyPresenceChooserPriv *priv;
-       McPresence                 state;
-       static gboolean            on = FALSE;
+       EmpathyPresenceChooser *chooser;
+       GtkWidget *entry;
 
-       priv = GET_PRIV (chooser);
+       DEBUG ("Autocommiting status message\n");
 
-       if (on) {
-               state = priv->flash_state_1;
-       } else {
-               state = priv->flash_state_2;
-       }
+       chooser = EMPATHY_PRESENCE_CHOOSER (user_data);
+       entry = gtk_bin_get_child (GTK_BIN (chooser));
 
-       gtk_image_set_from_icon_name (GTK_IMAGE (priv->image),
-                                     empathy_icon_name_for_presence_state (state),
-                                     GTK_ICON_SIZE_MENU);
+       presence_chooser_entry_activate_cb (chooser, GTK_ENTRY (entry));
 
-       on = !on;
+       return FALSE;
+}
 
-       return TRUE;
+static gboolean
+presence_chooser_entry_focus_out_cb (EmpathyPresenceChooser *chooser,
+                                     GdkEventFocus *event,
+                                    GtkEntry *entry)
+{
+       EmpathyPresenceChooserPriv *priv = GET_PRIV (chooser);
+
+       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.
+                *
+                * The entry has focused out, but we don't know where the focus
+                * has gone. If it goes to the combo box, we don't want to
+                * do anything. If it's gone anywhere else, we want to commit
+                * the result.
+                *
+                * Thus we install this idle handler and store its source.
+                * If the source is scheduled when the popup handler runs,
+                * 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);
+       }
+
+       gtk_editable_set_position (GTK_EDITABLE (entry), 0);
+
+       return FALSE;
 }
 
 static void
-presence_chooser_flash_start (EmpathyPresenceChooser *chooser,
-                             McPresence             state_1,
-                             McPresence             state_2)
+empathy_presence_chooser_init (EmpathyPresenceChooser *chooser)
 {
-       EmpathyPresenceChooserPriv *priv;
+       EmpathyPresenceChooserPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (chooser,
+               EMPATHY_TYPE_PRESENCE_CHOOSER, EmpathyPresenceChooserPriv);
+       GtkTreeModel *model;
+       GtkWidget *entry;
+       GtkCellRenderer *renderer;
 
-       g_return_if_fail (EMPATHY_IS_PRESENCE_CHOOSER (chooser));
+       chooser->priv = priv;
 
-       priv = GET_PRIV (chooser);
+       model = presence_chooser_create_model ();
 
-       priv->flash_state_1 = state_1;
-       priv->flash_state_2 = state_2;
+       gtk_combo_box_set_model (GTK_COMBO_BOX (chooser), GTK_TREE_MODEL (model));
+       gtk_combo_box_entry_set_text_column (GTK_COMBO_BOX_ENTRY (chooser),
+                       COL_STATUS_TEXT);
+       gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (chooser),
+                       combo_row_separator_func,
+                       NULL, NULL);
 
-       if (!priv->flash_timeout_id) {
-               priv->flash_timeout_id = g_timeout_add (FLASH_TIMEOUT,
-                                                       (GSourceFunc) presence_chooser_flash_timeout_cb,
-                                                       chooser);
-       }
+       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_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);
+       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);
+
+       g_signal_connect (chooser, "notify::popup-shown",
+                       G_CALLBACK (presence_chooser_popup_shown_cb), NULL);
+       g_signal_connect (chooser, "changed",
+                       G_CALLBACK (presence_chooser_changed_cb), NULL);
+       g_signal_connect_swapped (entry, "changed",
+                       G_CALLBACK (presence_chooser_entry_changed_cb),
+                       chooser);
+       g_signal_connect_swapped (entry, "focus-out-event",
+                       G_CALLBACK (presence_chooser_entry_focus_out_cb),
+                       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_object_set (chooser,
+                       // FIXME: this string sucks
+                       "tooltip-text", _("Set your presence and current status"),
+                       NULL);
 }
 
 static void
-presence_chooser_flash_stop (EmpathyPresenceChooser *chooser,
-                            McPresence             state)
+presence_chooser_finalize (GObject *object)
 {
        EmpathyPresenceChooserPriv *priv;
 
-       g_return_if_fail (EMPATHY_IS_PRESENCE_CHOOSER (chooser));
-
-       priv = GET_PRIV (chooser);
+       priv = GET_PRIV (object);
 
        if (priv->flash_timeout_id) {
                g_source_remove (priv->flash_timeout_id);
-               priv->flash_timeout_id = 0;
        }
 
-       gtk_image_set_from_icon_name (GTK_IMAGE (priv->image),
-                                     empathy_icon_name_for_presence_state (state),
-                                     GTK_ICON_SIZE_MENU);
-
-       priv->last_state = state;
-}
-
-static gboolean
-presence_chooser_button_press_event_cb (GtkWidget      *chooser,
-                                       GdkEventButton *event,
-                                       gpointer        user_data)
-{
-       if (event->button != 1 || event->type != GDK_BUTTON_PRESS) {
-               return FALSE;
+       if (priv->focus_out_idle_source) {
+               g_source_remove (priv->focus_out_idle_source);
        }
 
-       if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (chooser))) {
-                       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (chooser), TRUE);
-                       return TRUE;
-               }
+       g_signal_handlers_disconnect_by_func (priv->idle,
+                                             presence_chooser_presence_changed_cb,
+                                             object);
+       g_object_unref (priv->idle);
 
-       return FALSE;
+       G_OBJECT_CLASS (empathy_presence_chooser_parent_class)->finalize (object);
 }
 
-static void
-presence_chooser_toggled_cb (GtkWidget *chooser,
-                            gpointer   user_data)
+GtkWidget *
+empathy_presence_chooser_new (void)
 {
-       if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (chooser))) {
-               presence_chooser_menu_popup (EMPATHY_PRESENCE_CHOOSER (chooser));
-       } else {
-               presence_chooser_menu_popdown (EMPATHY_PRESENCE_CHOOSER (chooser));
-       }
+       GtkWidget *chooser;
+
+       chooser = g_object_new (EMPATHY_TYPE_PRESENCE_CHOOSER, NULL);
+
+       return chooser;
 }
 
 static void
-presence_chooser_menu_popup (EmpathyPresenceChooser *chooser)
+presence_chooser_presence_changed_cb (EmpathyPresenceChooser *chooser)
 {
        EmpathyPresenceChooserPriv *priv;
-       GtkWidget                 *menu;
+       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->menu) {
-               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);
 
-       menu = empathy_presence_chooser_create_menu ();
+       /* look through the model and attempt to find a matching state */
+       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)) {
+               int m_type;
+               McPresence m_state;
+               char *m_status;
 
-       g_signal_connect_after (menu, "selection-done",
-                               G_CALLBACK (presence_chooser_menu_selection_done_cb),
-                               chooser);
+               gtk_tree_model_get (model, &iter,
+                               COL_STATE, &m_state,
+                               COL_TYPE, &m_type,
+                               -1);
 
-       g_signal_connect (menu, "destroy",
-                         G_CALLBACK (presence_chooser_menu_destroy_cb),
-                         chooser);
+               if (m_type == ENTRY_TYPE_CUSTOM ||
+                   m_type == ENTRY_TYPE_SEPARATOR ||
+                   m_type == ENTRY_TYPE_EDIT_CUSTOM) {
+                       continue;
+               }
+               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) {
+                       /* we have passed the section that can contain our
+                        * match */
+                       break;
+               }
 
-       gtk_menu_attach_to_widget (GTK_MENU (menu),
-                                  GTK_WIDGET (chooser),
-                                  presence_chooser_menu_detach);
+               gtk_tree_model_get (model, &iter,
+                               COL_STATUS_TEXT, &m_status,
+                               -1);
 
-       gtk_menu_popup (GTK_MENU (menu),
-                       NULL, NULL,
-                       (GtkMenuPositionFunc) presence_chooser_menu_align_func,
-                       chooser,
-                       1,
-                       gtk_get_current_event_time ());
+               match = !strcmp (status, m_status);
+
+               g_free (m_status);
+
+               if (match) break;
+
+       }
 
-       priv->menu = menu;
+       if (match) {
+               priv->block_changed++;
+               gtk_combo_box_set_active_iter (GTK_COMBO_BOX (chooser), &iter);
+               priv->block_changed--;
+       }
+       else {
+               ui_set_custom_state (chooser, state, status);
+       }
+
+       if (flash_state != MC_PRESENCE_UNSET) {
+               presence_chooser_flash_start (chooser, state, flash_state);
+       }
+       else {
+               presence_chooser_flash_stop (chooser, state);
+       }
 }
 
-static void
-presence_chooser_menu_popdown (EmpathyPresenceChooser *chooser)
+static gboolean
+presence_chooser_flash_timeout_cb (EmpathyPresenceChooser *chooser)
 {
        EmpathyPresenceChooserPriv *priv;
+       McPresence                 state;
+       static gboolean            on = FALSE;
 
        priv = GET_PRIV (chooser);
 
-       if (priv->menu) {
-               gtk_widget_destroy (priv->menu);
+       if (on) {
+               state = priv->flash_state_1;
+       }
+       else {
+               state = priv->flash_state_2;
        }
-}
 
-static void
-presence_chooser_menu_selection_done_cb (GtkMenuShell          *menushell,
-                                        EmpathyPresenceChooser *chooser)
-{
-       gtk_widget_destroy (GTK_WIDGET (menushell));
+       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));
+
+       on = !on;
 
-       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (chooser), FALSE);
+       return TRUE;
 }
 
 static void
-presence_chooser_menu_destroy_cb (GtkWidget             *menu,
-                                 EmpathyPresenceChooser *chooser)
+presence_chooser_flash_start (EmpathyPresenceChooser *chooser,
+                             McPresence             state_1,
+                             McPresence             state_2)
 {
        EmpathyPresenceChooserPriv *priv;
 
+       g_return_if_fail (EMPATHY_IS_PRESENCE_CHOOSER (chooser));
+
        priv = GET_PRIV (chooser);
 
-       priv->menu = NULL;
-}
+       priv->flash_state_1 = state_1;
+       priv->flash_state_2 = state_2;
 
-static void
-presence_chooser_menu_detach (GtkWidget *attach_widget,
-                             GtkMenu   *menu)
-{
-       /* We don't need to do anything, but attaching the menu means
-        * we don't own the ref count and it is cleaned up properly.
-        */
+       if (!priv->flash_timeout_id) {
+               priv->flash_timeout_id = g_timeout_add (FLASH_TIMEOUT,
+                                                       (GSourceFunc) presence_chooser_flash_timeout_cb,
+                                                       chooser);
+       }
 }
 
 static void
-presence_chooser_menu_align_func (GtkMenu   *menu,
-                                 gint      *x,
-                                 gint      *y,
-                                 gboolean  *push_in,
-                                 GtkWidget *widget)
+presence_chooser_flash_stop (EmpathyPresenceChooser *chooser,
+                            McPresence             state)
 {
-       GtkRequisition  req;
-       GdkScreen      *screen;
-       gint            screen_height;
-
-       gtk_widget_size_request (GTK_WIDGET (menu), &req);
-
-       gdk_window_get_origin (widget->window, x, y);
-
-       *x += widget->allocation.x + 1;
-       *y += widget->allocation.y;
+       EmpathyPresenceChooserPriv *priv;
 
-       screen = gtk_widget_get_screen (GTK_WIDGET (menu));
-       screen_height = gdk_screen_get_height (screen);
+       g_return_if_fail (EMPATHY_IS_PRESENCE_CHOOSER (chooser));
 
-       if (req.height > screen_height) {
-               /* Too big for screen height anyway. */
-               *y = 0;
-               return;
-       }
+       priv = GET_PRIV (chooser);
 
-       if ((*y + req.height + widget->allocation.height) > screen_height) {
-               /* Can't put it below the button. */
-               *y -= req.height;
-               *y += 1;
-       } else {
-               /* Put menu below button. */
-               *y += widget->allocation.height;
-               *y -= 1;
+       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));
 
-       *push_in = FALSE;
+       gtk_entry_set_icon_from_icon_name (GTK_ENTRY (entry),
+                       GTK_ENTRY_ICON_PRIMARY,
+                       empathy_icon_name_for_presence (state));
 }
 
 GtkWidget *
@@ -663,7 +847,7 @@ empathy_presence_chooser_create_menu (void)
        for (i = 0; i < G_N_ELEMENTS (states); i += 2) {
                GList       *list, *l;
 
-               status = empathy_presence_state_get_default_status (states[i]);
+               status = empathy_presence_get_default_message (states[i]);
                presence_chooser_menu_add_item (menu,
                                                status,
                                                states[i]);
@@ -681,7 +865,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);
@@ -712,7 +896,7 @@ presence_chooser_menu_add_item (GtkWidget   *menu,
        const gchar *icon_name;
 
        item = gtk_image_menu_item_new_with_label (str);
-       icon_name = empathy_icon_name_for_presence_state (state);
+       icon_name = empathy_icon_name_for_presence (state);
 
        g_signal_connect (item, "activate",
                          G_CALLBACK (presence_chooser_noncustom_activate_cb),
@@ -752,7 +936,7 @@ presence_chooser_set_state (McPresence   state,
 {
        EmpathyIdle *idle;
 
-       idle = empathy_idle_new ();
+       idle = empathy_idle_dup_singleton ();
        empathy_idle_set_presence (idle, state, status);
        g_object_unref (idle);
 }
@@ -761,7 +945,7 @@ static void
 presence_chooser_custom_activate_cb (GtkWidget *item,
                                     gpointer   user_data)
 {
-       presence_chooser_dialog_show ();
+       presence_chooser_dialog_show (NULL);
 }
 
 static McPresence
@@ -806,6 +990,8 @@ presence_chooser_dialog_status_changed_cb (GtkWidget           *widget,
 
        gtk_combo_box_set_model (GTK_COMBO_BOX (dialog->comboboxentry_message),
                                 GTK_TREE_MODEL (store));
+
+       g_object_unref (store);
 }
 
 static void
@@ -822,7 +1008,7 @@ presence_chooser_dialog_message_changed_cb (GtkWidget           *widget,
 
        messages = empathy_status_presets_get (presence, -1);
        for (l = messages; l; l = l->next) {
-               if (!empathy_strdiff (text, l->data)) {
+               if (!tp_strdiff (text, l->data)) {
                        found = TRUE;
                        break;
                }
@@ -847,7 +1033,8 @@ presence_chooser_dialog_save_toggled_cb (GtkWidget           *widget,
 
        if (active) {
                empathy_status_presets_set_last (state, text);
-       } else {
+       }
+       else {
                empathy_status_presets_remove (state, text);
        }
 }
@@ -887,8 +1074,8 @@ presence_chooser_dialog_setup (CustomMessageDialog *dialog)
 
                gtk_list_store_append (store, &iter);
                gtk_list_store_set (store, &iter,
-                                   COL_ICON, empathy_icon_name_for_presence_state (states[i]),
-                                   COL_LABEL, empathy_presence_state_get_default_status (states[i]),
+                                   COL_ICON, empathy_icon_name_for_presence (states[i]),
+                                   COL_LABEL, empathy_presence_get_default_message (states[i]),
                                    COL_PRESENCE, states[i],
                                    -1);
        }
@@ -897,25 +1084,37 @@ presence_chooser_dialog_setup (CustomMessageDialog *dialog)
 }
 
 static void
-presence_chooser_dialog_destroy_cb (GtkWidget           *widget,
-                                   CustomMessageDialog *dialog)
+presence_chooser_dialog_response_cb (GtkWidget           *widget,
+                                    gint                 response,
+                                    CustomMessageDialog *dialog)
 {
-       McPresence   state;
-       const gchar *text;
+       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));
+               state = presence_chooser_dialog_get_selected (dialog);
+               text = gtk_entry_get_text (GTK_ENTRY (dialog->entry_message));
+
+               presence_chooser_set_state (state, text);
+       }
 
-       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 (void)
+presence_chooser_dialog_show (GtkWindow *parent)
 {
        GladeXML *glade;
+       gchar    *filename;
 
        if (message_dialog) {
                gtk_window_present (GTK_WINDOW (message_dialog->dialog));
@@ -923,7 +1122,10 @@ presence_chooser_dialog_show (void)
        }
 
        message_dialog = g_new0 (CustomMessageDialog, 1);
-       glade = empathy_glade_get_file ("empathy-presence-chooser.glade",
+
+       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,
@@ -931,10 +1133,12 @@ presence_chooser_dialog_show (void)
                                       "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", gtk_widget_destroy,
+                              "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);
@@ -953,7 +1157,12 @@ presence_chooser_dialog_show (void)
 
        gtk_combo_box_entry_set_text_column (GTK_COMBO_BOX_ENTRY (message_dialog->comboboxentry_message), 0);
 
-       /* FIXME: Set transian for a window ? */
+       if (parent)
+       {
+               gtk_window_set_transient_for (
+                               GTK_WINDOW (message_dialog->dialog),
+                               parent);
+       }
 
        gtk_widget_show_all (message_dialog->dialog);
 }