aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrédéric Péters <fpeters@0d.be>2009-07-28 04:58:01 +0800
committerFrédéric Péters <fpeters@0d.be>2009-07-28 14:15:46 +0800
commit6df1c4bdd81fbbb288b8e49c3bea9a1dd2e005a6 (patch)
tree286f34614f4630e7b7ba20e691727f966136bde1
parentfdd1174c22b2de215c0a4fd0b33051a3b44f5661 (diff)
downloadgsoc2013-empathy-6df1c4bdd81fbbb288b8e49c3bea9a1dd2e005a6.tar
gsoc2013-empathy-6df1c4bdd81fbbb288b8e49c3bea9a1dd2e005a6.tar.gz
gsoc2013-empathy-6df1c4bdd81fbbb288b8e49c3bea9a1dd2e005a6.tar.bz2
gsoc2013-empathy-6df1c4bdd81fbbb288b8e49c3bea9a1dd2e005a6.tar.lz
gsoc2013-empathy-6df1c4bdd81fbbb288b8e49c3bea9a1dd2e005a6.tar.xz
gsoc2013-empathy-6df1c4bdd81fbbb288b8e49c3bea9a1dd2e005a6.tar.zst
gsoc2013-empathy-6df1c4bdd81fbbb288b8e49c3bea9a1dd2e005a6.zip
Set status text first in presence chooser widget model.
ATK will take the first column of the model to get the textual value of a row, so make it something useful (instead of icon-name); also fill that cell with a value for "custom message" commands, so they are also known to ATK. (GNOME bug 589830)
-rw-r--r--libempathy-gtk/empathy-presence-chooser.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/libempathy-gtk/empathy-presence-chooser.c b/libempathy-gtk/empathy-presence-chooser.c
index 8fba26ff7..69b031c05 100644
--- a/libempathy-gtk/empathy-presence-chooser.c
+++ b/libempathy-gtk/empathy-presence-chooser.c
@@ -79,9 +79,9 @@ enum {
/* For combobox's model */
enum {
+ COL_STATUS_TEXT,
COL_STATE_ICON_NAME,
COL_STATE,
- COL_STATUS_TEXT,
COL_DISPLAY_MARKUP,
COL_STATUS_CUSTOMISABLE,
COL_TYPE,
@@ -162,9 +162,9 @@ presence_chooser_create_model (EmpathyPresenceChooser *self)
int i;
store = gtk_list_store_new (N_COLUMNS,
+ G_TYPE_STRING, /* COL_STATUS_TEXT */
G_TYPE_STRING, /* COL_STATE_ICON_NAME */
G_TYPE_UINT, /* 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 */
@@ -179,9 +179,9 @@ presence_chooser_create_model (EmpathyPresenceChooser *self)
icon_name = empathy_icon_name_for_presence (states[i].state);
gtk_list_store_insert_with_values (store, NULL, -1,
+ COL_STATUS_TEXT, status,
COL_STATE_ICON_NAME, icon_name,
COL_STATE, states[i].state,
- COL_STATUS_TEXT, status,
COL_DISPLAY_MARKUP, status,
COL_STATUS_CUSTOMISABLE, states[i].customisable,
COL_TYPE, ENTRY_TYPE_BUILTIN,
@@ -194,9 +194,9 @@ presence_chooser_create_model (EmpathyPresenceChooser *self)
for (l = list; l; l = l->next) {
gtk_list_store_insert_with_values (store,
NULL, -1,
+ COL_STATUS_TEXT, l->data,
COL_STATE_ICON_NAME, icon_name,
COL_STATE, states[i].state,
- COL_STATUS_TEXT, l->data,
COL_DISPLAY_MARKUP, l->data,
COL_STATUS_CUSTOMISABLE, TRUE,
COL_TYPE, ENTRY_TYPE_SAVED,
@@ -205,9 +205,9 @@ presence_chooser_create_model (EmpathyPresenceChooser *self)
g_list_free (list);
gtk_list_store_insert_with_values (store, NULL, -1,
+ COL_STATUS_TEXT, _("Custom Message..."),
COL_STATE_ICON_NAME, icon_name,
COL_STATE, states[i].state,
- COL_STATUS_TEXT, "",
COL_DISPLAY_MARKUP, custom_message,
COL_STATUS_CUSTOMISABLE, TRUE,
COL_TYPE, ENTRY_TYPE_CUSTOM,
@@ -222,8 +222,8 @@ presence_chooser_create_model (EmpathyPresenceChooser *self)
-1);
gtk_list_store_insert_with_values (store, NULL, -1,
+ COL_STATUS_TEXT, _("Edit Custom Messages..."),
COL_STATE_ICON_NAME, GTK_STOCK_EDIT,
- COL_STATUS_TEXT, "",
COL_DISPLAY_MARKUP, _("Edit Custom Messages..."),
COL_TYPE, ENTRY_TYPE_EDIT_CUSTOM,
-1);