[Goodies-commits] r6752 - in xfce4-screenshooter/trunk: . lib

[Jerome Guelfucci]

Author: jeromeg
Date: 2009-02-22 13:02:45 +0000 (Sun, 22 Feb 2009)
New Revision: 6752

Modified:
   xfce4-screenshooter/trunk/ChangeLog
   xfce4-screenshooter/trunk/lib/screenshooter-dialogs.c
Log:
* lib/screenshooter-dialogs.c:
  (set_default_item) do not look up for a default item if the tree is empty.


Modified: xfce4-screenshooter/trunk/ChangeLog
===================================================================
--- xfce4-screenshooter/trunk/ChangeLog	2009-02-22 11:23:45 UTC (rev 6751)
+++ xfce4-screenshooter/trunk/ChangeLog	2009-02-22 13:02:45 UTC (rev 6752)
@@ -1,5 +1,10 @@
 2009-02-22 jeromeg
 
+  * lib/screenshooter-dialogs.c:
+    (set_default_item) do not look up for a default item if the tree is empty.
+
+2009-02-22 jeromeg
+
   * lib/screenshooter-utils.c: add some additionnal debugging information.
 
 2009-02-22 jeromeg

Modified: xfce4-screenshooter/trunk/lib/screenshooter-dialogs.c
===================================================================
--- xfce4-screenshooter/trunk/lib/screenshooter-dialogs.c	2009-02-22 11:23:45 UTC (rev 6751)
+++ xfce4-screenshooter/trunk/lib/screenshooter-dialogs.c	2009-02-22 13:02:45 UTC (rev 6752)
@@ -375,42 +375,51 @@
 {
   GtkTreeModel *model = 
     gtk_combo_box_get_model (GTK_COMBO_BOX (combobox));
+  
   GtkTreeIter iter; 
-  gchar *command = NULL;
-  gboolean found = FALSE;
-  
+    
   /* Get the first iter */
-  gtk_tree_model_get_iter_first (model , &iter);
-       
-  /* Loop until finding the appropirate item, if any */
-  do
-    {
-      gtk_tree_model_get (model, &iter, 2, &command, -1);
+  if (gtk_tree_model_get_iter_first (model , &iter))
+    {     
+      gchar *command = NULL;
+      gboolean found = FALSE;
+
+      /* Loop until finding the appropirate item, if any */
+      do
+        {
+          gtk_tree_model_get (model, &iter, 2, &command, -1);
+          
+          if (g_str_equal (command, sd->app))
+            {
+              gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combobox), 
+                                             &iter);
+              
+              found = TRUE;
+            }
+          
+          g_free (command);      
+        }
+      while (gtk_tree_model_iter_next (model, &iter));
       
-      if (g_str_equal (command, sd->app))
+      /* If no suitable item was found, set the first item as active and
+       * set sd->app accordingly. */
+      if (!found)
         {
-          gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combobox), 
-                                         &iter);
+          gtk_tree_model_get_iter_first (model , &iter);
+          gtk_tree_model_get (model, &iter, 2, &command, -1);
           
-          found = TRUE;
+          gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combobox), &iter);
+          
+          g_free (sd->app);
+          
+          sd->app = command;
         }
-      
-      g_free (command);      
     }
-  while (gtk_tree_model_iter_next (model, &iter));
-  
-  /* If no suitable item was found, set the first item as active and
-   * set sd->app accordingly. */
-  if (!found)
+  else
     {
-      gtk_tree_model_get_iter_first (model , &iter);
-      gtk_tree_model_get (model, &iter, 2, &command, -1);
-      
-      gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combobox), &iter);
-      
       g_free (sd->app);
-      
-      sd->app = command;
+
+      sd->app = g_strdup ("none");
     }
 }                              
 #endif