rpms/im-chooser/devel im-chooser-0.99.5-no-crash-on-no-im.patch, NONE, 1.1

Akira Tagoh (tagoh) fedora-extras-commits at redhat.com
Mon Apr 7 14:17:44 UTC 2008


Author: tagoh

Update of /cvs/pkgs/rpms/im-chooser/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1625

Added Files:
	im-chooser-0.99.5-no-crash-on-no-im.patch 
Log Message:


im-chooser-0.99.5-no-crash-on-no-im.patch:

--- NEW FILE im-chooser-0.99.5-no-crash-on-no-im.patch ---
diff -pruN im-chooser-0.99.5.orig/src/im-chooser-simple.c im-chooser-0.99.5/src/im-chooser-simple.c
--- im-chooser-0.99.5.orig/src/im-chooser-simple.c	2008-03-11 21:43:50.000000000 +0900
+++ im-chooser-0.99.5/src/im-chooser-simple.c	2008-04-07 22:59:42.000000000 +0900
@@ -624,12 +624,15 @@ _im_chooser_simple_update_im_list(IMChoo
 	GtkTreePath *path;
 	GtkTreeViewColumn *column;
 	GtkRequisition requisition;
-	guint count;
+	guint count = 0;
 	gint i, priority = 0;
 	gchar *user_im, *system_im;
 
 	user_im = imsettings_request_get_current_user_im(im->imsettings_info);
 	system_im = imsettings_request_get_current_system_im(im->imsettings_info);
+	if (im->im_list == NULL)
+		goto end;
+
 	count = g_strv_length(im->im_list);
 	list = gtk_list_store_new(3, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT);
 	for (i = 0; im->im_list[i] != NULL; i++) {
@@ -689,6 +692,7 @@ _im_chooser_simple_update_im_list(IMChoo
 	g_free(user_im);
 	g_free(system_im);
 
+  end:
 	if (count == 0) {
 		gtk_widget_set_sensitive(im->checkbox_is_im_enabled, FALSE);
 		gtk_widget_hide(im->widget_scrolled);




More information about the fedora-extras-commits mailing list