diff options
| author | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2010-10-18 07:35:00 +0800 |
|---|---|---|
| committer | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2010-10-18 08:07:25 +0800 |
| commit | 0edff90c614fd8011c12c7be6981df5d9443f41b (patch) | |
| tree | 91ac0838da6d66adea0ce9ccaf4ac13a432f9802 | |
| parent | 18c25feae5e0094113b7e7327b3f0de308f1f369 (diff) | |
| download | gsoc2013-empathy-0edff90c614fd8011c12c7be6981df5d9443f41b.tar gsoc2013-empathy-0edff90c614fd8011c12c7be6981df5d9443f41b.tar.gz gsoc2013-empathy-0edff90c614fd8011c12c7be6981df5d9443f41b.tar.bz2 gsoc2013-empathy-0edff90c614fd8011c12c7be6981df5d9443f41b.tar.lz gsoc2013-empathy-0edff90c614fd8011c12c7be6981df5d9443f41b.tar.xz gsoc2013-empathy-0edff90c614fd8011c12c7be6981df5d9443f41b.tar.zst gsoc2013-empathy-0edff90c614fd8011c12c7be6981df5d9443f41b.zip | |
Port empathy-status-preset-dialog to GtkComboBox
| -rw-r--r-- | libempathy-gtk/empathy-status-preset-dialog.c | 4 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-status-preset-dialog.h | 2 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-status-preset-dialog.ui | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/libempathy-gtk/empathy-status-preset-dialog.c b/libempathy-gtk/empathy-status-preset-dialog.c index 2d7ecfe6e..957a17d58 100644 --- 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++) { diff --git a/libempathy-gtk/empathy-status-preset-dialog.h b/libempathy-gtk/empathy-status-preset-dialog.h index 2c507ce37..5cf0e3397 100644 --- a/libempathy-gtk/empathy-status-preset-dialog.h +++ b/libempathy-gtk/empathy-status-preset-dialog.h @@ -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> */ #ifndef __EMPATHY_STATUS_PRESET_DIALOG_H__ diff --git a/libempathy-gtk/empathy-status-preset-dialog.ui b/libempathy-gtk/empathy-status-preset-dialog.ui index a33018201..754a95bf4 100644 --- a/libempathy-gtk/empathy-status-preset-dialog.ui +++ b/libempathy-gtk/empathy-status-preset-dialog.ui @@ -88,8 +88,9 @@ <property name="visible">True</property> <property name="spacing">3</property> <child> - <object class="GtkComboBoxEntry" id="add-combobox"> + <object class="GtkComboBox" id="add-combobox"> <property name="visible">True</property> + <property name="has-entry">True</property> </object> <packing> <property name="position">0</property> |