Author: benny
Date: 2006-07-06 21:19:27 +0000 (Thu, 06 Jul 2006)
New Revision: 22287

Modified:
   thunar/trunk/ChangeLog
   thunar/trunk/thunar/thunar-list-model.c
Log:
2006-07-06      Benedikt Meurer <[EMAIL PROTECTED]>

        * thunar/thunar-list-model.c(thunar_list_model_get_sort_column_id):
          Fix a crash with GTK+ 2.10. Bug #1995.




Modified: thunar/trunk/ChangeLog
===================================================================
--- thunar/trunk/ChangeLog      2006-07-06 19:06:11 UTC (rev 22286)
+++ thunar/trunk/ChangeLog      2006-07-06 21:19:27 UTC (rev 22287)
@@ -1,3 +1,8 @@
+2006-07-06     Benedikt Meurer <[EMAIL PROTECTED]>
+
+       * thunar/thunar-list-model.c(thunar_list_model_get_sort_column_id):
+         Fix a crash with GTK+ 2.10. Bug #1995.
+
 2006-07-01     Benedikt Meurer <[EMAIL PROTECTED]>
 
        * docs/README.thunarrc, thunar/thunar-preferences.c: Add a new option

Modified: thunar/trunk/thunar/thunar-list-model.c
===================================================================
--- thunar/trunk/thunar/thunar-list-model.c     2006-07-06 19:06:11 UTC (rev 
22286)
+++ thunar/trunk/thunar/thunar-list-model.c     2006-07-06 21:19:27 UTC (rev 
22287)
@@ -944,10 +944,13 @@
   else
     g_assert_not_reached ();
 
-  if (store->sort_sign > 0)
-    *order = GTK_SORT_ASCENDING;
-  else
-    *order = GTK_SORT_DESCENDING;
+  if (order != NULL)
+    {
+      if (store->sort_sign > 0)
+        *order = GTK_SORT_ASCENDING;
+      else
+        *order = GTK_SORT_DESCENDING;
+    }
 
   return TRUE;
 }

_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits

Reply via email to