Merge branch 'sasl'

[empathy.git] / libempathy-gtk / empathy-status-preset-dialog.c

diff --git a/libempathy-gtk/empathy-status-preset-dialog.c b/libempathy-gtk/empathy-status-preset-dialog.c
index 2a5904bfb0d8ba187e306f8efae4bf8a664223a1..957a17d5858f1610d036c92df6b2d3c76bdbb042 100644 (file)
--- a/libempathy-gtk/empathy-status-preset-dialog.c
+++ b/libempathy-gtk/empathy-status-preset-dialog.c
@@ -22,7 +22,7 @@
  * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
  * Boston, MA  02110-1301  USA
  *
- * Authors: Davyd Madeley <davyd.madeley@collabora.co.uk>
+ * Authors: Danielle Madeley <danielle.madeley@collabora.co.uk>
  */
 /**
  * SECTION:empathy-status-preset-dialog
@@ -179,7 +179,7 @@ status_preset_dialog_setup_add_combobox (EmpathyStatusPresetDialog *self)
                                 GTK_TREE_MODEL (store));
        g_object_unref (store);
 
-       gtk_combo_box_entry_set_text_column (GTK_COMBO_BOX_ENTRY (combobox),
+       gtk_combo_box_set_entry_text_column (GTK_COMBO_BOX (combobox),
                        ADD_COMBO_DEFAULT_TEXT);
 
        for (i = 0; i < G_N_ELEMENTS (states); i++) {
@@ -521,7 +521,6 @@ empathy_status_preset_dialog_init (EmpathyStatusPresetDialog *self)
 
        gtk_window_set_title (GTK_WINDOW (self),
                        _("Edit Custom Messages"));
-       empathy_dialog_remove_separator (GTK_DIALOG (self));
        gtk_dialog_add_button (GTK_DIALOG (self),
                        GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);