aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavyd Madeley <davyd@madeley.id.au>2009-04-23 19:30:48 +0800
committerDavyd Madeley <davyd@madeley.id.au>2009-04-23 19:30:48 +0800
commit7a94f85d284baebdd3bbc0607205d3ced82748a2 (patch)
treeba1f3275ccdc7b1f33d96d28850ff1d25308df45
parent88e713991752dfccebc37309571384165d557d6c (diff)
downloadgsoc2013-empathy-7a94f85d284baebdd3bbc0607205d3ced82748a2.tar
gsoc2013-empathy-7a94f85d284baebdd3bbc0607205d3ced82748a2.tar.gz
gsoc2013-empathy-7a94f85d284baebdd3bbc0607205d3ced82748a2.tar.bz2
gsoc2013-empathy-7a94f85d284baebdd3bbc0607205d3ced82748a2.tar.lz
gsoc2013-empathy-7a94f85d284baebdd3bbc0607205d3ced82748a2.tar.xz
gsoc2013-empathy-7a94f85d284baebdd3bbc0607205d3ced82748a2.tar.zst
gsoc2013-empathy-7a94f85d284baebdd3bbc0607205d3ced82748a2.zip
Sort presets alphabetically in the list
-rw-r--r--libempathy-gtk/empathy-presence-chooser.c3
-rw-r--r--libempathy-gtk/empathy-status-preset-dialog.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/libempathy-gtk/empathy-presence-chooser.c b/libempathy-gtk/empathy-presence-chooser.c
index d565cf387..d97abea0c 100644
--- a/libempathy-gtk/empathy-presence-chooser.c
+++ b/libempathy-gtk/empathy-presence-chooser.c
@@ -170,7 +170,8 @@ presence_chooser_create_model (EmpathyPresenceChooser *self)
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_insert_with_values (store,
NULL, -1,
diff --git a/libempathy-gtk/empathy-status-preset-dialog.c b/libempathy-gtk/empathy-status-preset-dialog.c
index 562b9e4d9..d8416a585 100644
--- a/libempathy-gtk/empathy-status-preset-dialog.c
+++ b/libempathy-gtk/empathy-status-preset-dialog.c
@@ -108,8 +108,9 @@ status_preset_dialog_presets_update (EmpathyStatusPresetDialog *self)
GList *presets, *l;
const char *icon_name;
- presets = empathy_status_presets_get (states[i], -1);
icon_name = empathy_icon_name_for_presence (states[i]);
+ presets = empathy_status_presets_get (states[i], -1);
+ presets = g_list_sort (presets, (GCompareFunc) g_utf8_collate);
for (l = presets; l; l = l->next) {
char *preset = (char *) l->data;