nautilus r13679 - in trunk: . libnautilus-private

[alexl svn gnome org]

Author: alexl
Date: Fri Feb  1 11:51:35 2008
New Revision: 13679
URL: http://svn.gnome.org/viewvc/nautilus?rev=13679&view=rev

Log:
2008-02-01  Alexander Larsson  <alexl redhat com>

        * libnautilus-private/nautilus-mime-actions.c:
	Handle GAppInfos having NULL id




Modified:
   trunk/ChangeLog
   trunk/libnautilus-private/nautilus-mime-actions.c

Modified: trunk/libnautilus-private/nautilus-mime-actions.c
==============================================================================
--- trunk/libnautilus-private/nautilus-mime-actions.c	(original)
+++ trunk/libnautilus-private/nautilus-mime-actions.c	Fri Feb  1 11:51:35 2008
@@ -129,13 +129,16 @@
 {
 	GList *l, *next;
 	GAppInfo *application;
+	const char *id;
 
 	l = apps;
 	while (l != NULL) {
 		application = (GAppInfo *) l->data;
 		next = l->next;
 
-		if (strcmp (g_app_info_get_id (application),
+		id = g_app_info_get_id (application);
+		if (id != NULL &&
+		    strcmp (id,
 			    "nautilus-folder-handler.desktop") == 0) {
 			g_object_unref (application);
 			apps = g_list_delete_link (apps, l); 
@@ -284,8 +287,31 @@
 application_compare_by_id (const GAppInfo *app_a,
 			   const GAppInfo *app_b)
 {
-	return g_utf8_collate (g_app_info_get_id ((GAppInfo *)app_a),
-			       g_app_info_get_id ((GAppInfo *)app_b));
+	const char *id_a, *id_b;
+
+	id_a = g_app_info_get_id ((GAppInfo *)app_a);
+	id_b = g_app_info_get_id ((GAppInfo *)app_b);
+
+	if (id_a == NULL && id_b == NULL) {
+		if (g_app_info_equal ((GAppInfo *)app_a, (GAppInfo *)app_b)) {
+			return 0;
+		}
+		if ((gsize)app_a < (gsize) app_b) {
+			return -1;
+		}
+		return 1;
+	}
+
+	if (id_a == NULL) {
+		return -1;
+	}
+	
+	if (id_b == NULL) {
+		return 1;
+	}
+	
+	
+	return strcmp (id_a, id_b);
 }
 
 GList *
@@ -429,8 +455,7 @@
 		a_app = (GAppInfo *) l->data;
 		b_app = (GAppInfo *) m->data;
 
-		cmp = strcmp (g_app_info_get_id (a_app),
-			      g_app_info_get_id (b_app));
+		cmp = application_compare_by_id (a_app, b_app);
 		if (cmp > 0) {
 			g_object_unref (b_app);
 			m = m->next;
@@ -763,7 +788,15 @@
 static unsigned int
 mime_application_hash (GAppInfo *app)
 {
-	return g_str_hash (g_app_info_get_id (app));
+	const char *id;
+
+	id = g_app_info_get_id (app);
+
+	if (id == NULL) {
+		return (guint) app;
+	}
+	
+	return g_str_hash (id);
 }
 
 static void