diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | libempathy-gtk/empathy-profile-chooser.c | 31 |
2 files changed, 18 insertions, 18 deletions
@@ -1,5 +1,10 @@ 2007-07-28 Xavier Claessens <xclaesse@gmail.com> + * libempathy-gtk/empathy-profile-chooser.c: Makes easier to change to + profile order. + +2007-07-28 Xavier Claessens <xclaesse@gmail.com> + * libempathy-gtk/empathy-account-widget-jabber.c: Try to guess the server from the jid only if we are using the jabber profile. When we guessed a server don't forget to set the "server" McAccount param, diff --git a/libempathy-gtk/empathy-profile-chooser.c b/libempathy-gtk/empathy-profile-chooser.c index a03da1750..f1d508ffc 100644 --- a/libempathy-gtk/empathy-profile-chooser.c +++ b/libempathy-gtk/empathy-profile-chooser.c @@ -55,26 +55,21 @@ empathy_profile_chooser_get_selected (GtkWidget *widget) static gint profile_chooser_sort_profile_value (McProfile *profile) { - const gchar *name; - - name = mc_profile_get_unique_name (profile); - - /* Jabber is the prefered protocol, salut is a free protocol so it - * should be at the begining of the list, and google talk uses the - * free jabber protocol so it gets the 3rd place. - * FIXME: Add other free protocols in this list. - */ - if (strcmp (name, "jabber") == 0) { - return 0; - } - else if (strcmp (name, "salut") == 0) { - return 1; - } - else if (strcmp (name, "gtalk") == 0) { - return 2; + guint i; + const gchar *profile_name; + const gchar *names[] = {"jabber", + "salut", + "gtalk"}; + + profile_name = mc_profile_get_unique_name (profile); + + for (i = 0 ; i < G_N_ELEMENTS (names); i++) { + if (strcmp (profile_name, names[i]) == 0) { + return i; + } } - return 3; + return i; } static gint |