aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--libempathy-gtk/empathy-profile-chooser.c12
2 files changed, 17 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 53742fde9..e183cdbf3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2007-08-02 Xavier Claessens <xclaesse@gmail.com>
+ * libempathy-gtk/empathy-profile-chooser.c: Do not list profiles that
+ don't have the corresponding CM installed when creating a new account.
+ This is a workaround for MC bug: SF #1688779.
+
+2007-08-02 Xavier Claessens <xclaesse@gmail.com>
+
* libempathy-gtk/empathy-account-widget-generic.c: Remove size_group.
Fixes bug #462792.
diff --git a/libempathy-gtk/empathy-profile-chooser.c b/libempathy-gtk/empathy-profile-chooser.c
index 6276c90b5..4bc1d6c95 100644
--- a/libempathy-gtk/empathy-profile-chooser.c
+++ b/libempathy-gtk/empathy-profile-chooser.c
@@ -26,6 +26,7 @@
#include <gtk/gtk.h>
#include <libmissioncontrol/mc-profile.h>
+#include <libmissioncontrol/mc-protocol.h>
#include "empathy-profile-chooser.h"
#include "empathy-ui-utils.h"
@@ -146,10 +147,19 @@ empathy_profile_chooser_new (void)
profiles = mc_profiles_list ();
for (l = profiles; l; l = l->next) {
- McProfile *profile;
+ McProfile *profile;
+ McProtocol *protocol;
profile = l->data;
+ /* Check if the CM is installed, otherwise skip that profile.
+ * Workaround SF bug #1688779 */
+ protocol = mc_profile_get_protocol (profile);
+ if (!protocol) {
+ continue;
+ }
+ g_object_unref (protocol);
+
gtk_list_store_append (store, &iter);
gtk_list_store_set (store, &iter,
COL_ICON, mc_profile_get_icon_name (profile),