Workaround to fix a commonly reported crash. Add a missing check.

2007-07-07 Xavier Claessens  <xclaesse@gmail.com>

	* libempathy-gtk/empathy-account-widget-generic.c: Workaround to fix a
	commonly reported crash.
	* libempathy/empathy-tp-group.c: Add a missing check.

svn path=/trunk/; revision=177

diff --git a/ChangeLog b/ChangeLog
index 8715d4e88634a9ac8bf5d49aab1c64f8cf710da8..01cb9ee9ef104d6611d7e3df10fa1d9219ace4c2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-07-07 Xavier Claessens  <xclaesse@gmail.com>
+
+       * libempathy-gtk/empathy-account-widget-generic.c: Workaround to fix a 
+       commonly reported crash.
+       * libempathy/empathy-tp-group.c: Add a missing check.
+
 2007-06-30 Xavier Claessens  <xclaesse@gmail.com>
 
        * configure.ac: Bump MC version required to 4.27.

diff --git a/libempathy-gtk/empathy-account-widget-generic.c b/libempathy-gtk/empathy-account-widget-generic.c
index 73b579a55f4c8a4e180df7286faa074290c273f7..1ba38f7fb4895e53aa981490cda33d853c5c73e9 100644 (file)
--- a/libempathy-gtk/empathy-account-widget-generic.c
+++ b/libempathy-gtk/empathy-account-widget-generic.c
@@ -251,6 +251,17 @@ accounts_widget_generic_setup (EmpathyAccountWidgetGeneric *settings)
 
        profile = mc_account_get_profile (settings->account);
        protocol = mc_profile_get_protocol (profile);
+
+       if (!protocol) {
+               /* The CM is not installed, MC shouldn't list them
+                * see SF bug #1688779
+                * FIXME: We should display something asking the user to 
+                * install the CM
+                */
+               g_object_unref (profile);
+               return;
+       }
+
        params = mc_protocol_get_params (protocol);
 
        g_slist_foreach (params,

diff --git a/libempathy/empathy-tp-group.c b/libempathy/empathy-tp-group.c
index 45a5e784de4be661d5756fe256af90cdec46bb6f..65e52f091a4f6da0e226ff639e2c3ae7e52768ad 100644 (file)
--- a/libempathy/empathy-tp-group.c
+++ b/libempathy/empathy-tp-group.c
@@ -163,6 +163,7 @@ empathy_tp_group_new (TpChan *tp_chan,
        DBusGProxy         *group_iface;
 
        g_return_val_if_fail (TELEPATHY_IS_CHAN (tp_chan), NULL);
+       g_return_val_if_fail (TELEPATHY_IS_CONN (tp_conn), NULL);
 
        group_iface = tp_chan_get_interface (tp_chan,
                                             TELEPATHY_CHAN_IFACE_GROUP_QUARK);