aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk/empathy-main-window.c
diff options
context:
space:
mode:
authorXavier Claessens <xclaesse@gmail.com>2007-09-26 21:45:25 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2007-09-26 21:45:25 +0800
commit8d377a95ed24080b068ceffc3cb2d6d12ccb15e4 (patch)
tree907b269adcdde6d57486589a57d3c988abba7835 /libempathy-gtk/empathy-main-window.c
parent710a731e3bdff1948d18aef1e4fd1727454bb357 (diff)
downloadgsoc2013-empathy-8d377a95ed24080b068ceffc3cb2d6d12ccb15e4.tar
gsoc2013-empathy-8d377a95ed24080b068ceffc3cb2d6d12ccb15e4.tar.gz
gsoc2013-empathy-8d377a95ed24080b068ceffc3cb2d6d12ccb15e4.tar.bz2
gsoc2013-empathy-8d377a95ed24080b068ceffc3cb2d6d12ccb15e4.tar.lz
gsoc2013-empathy-8d377a95ed24080b068ceffc3cb2d6d12ccb15e4.tar.xz
gsoc2013-empathy-8d377a95ed24080b068ceffc3cb2d6d12ccb15e4.tar.zst
gsoc2013-empathy-8d377a95ed24080b068ceffc3cb2d6d12ccb15e4.zip
Fix warning when sort criterium is NULL and when there is no profile.
2007-09-26 Xavier Claessens <xclaesse@gmail.com> * libempathy-gtk/empathy-profile-chooser.c: * libempathy-gtk/empathy-main-window.c: Fix warning when sort criterium is NULL and when there is no profile. Fixes bug #479786 (Christian Persch, Xavier Claessens). svn path=/trunk/; revision=318
Diffstat (limited to 'libempathy-gtk/empathy-main-window.c')
-rw-r--r--libempathy-gtk/empathy-main-window.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libempathy-gtk/empathy-main-window.c b/libempathy-gtk/empathy-main-window.c
index c021df7dd..7867b949c 100644
--- a/libempathy-gtk/empathy-main-window.c
+++ b/libempathy-gtk/empathy-main-window.c
@@ -897,13 +897,13 @@ main_window_notify_compact_contact_list_cb (EmpathyConf *conf,
}
static void
-main_window_notify_sort_criterium_cb (EmpathyConf *conf,
+main_window_notify_sort_criterium_cb (EmpathyConf *conf,
const gchar *key,
EmpathyMainWindow *window)
{
gchar *str = NULL;
- if (empathy_conf_get_string (conf, key, &str)) {
+ if (empathy_conf_get_string (conf, key, &str) && str) {
GType type;
GEnumClass *enum_class;
GEnumValue *enum_value;
@@ -915,7 +915,7 @@ main_window_notify_sort_criterium_cb (EmpathyConf *conf,
if (enum_value) {
empathy_contact_list_store_set_sort_criterium (window->list_store,
- enum_value->value);
+ enum_value->value);
}
}
}