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.



git-svn-id: svn+ssh://svn.gnome.org/svn/empathy/trunk@177 4ee84921-47dd-4033-b63a-18d7a039a3e4

3 files changed, 18 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 8715d4e88..01cb9ee9e 100644
--- 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 73b579a55..1ba38f7fb 100644
--- 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 45a5e784d..65e52f091 100644
--- 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);