fix recent files issues

diff --git a/ChangeLog b/ChangeLog
index adb0a9e1ab8c9e458183cdce811cbf5ee1e5402b..52342f0e544150b43a48126c6b9160d7ea17fe9d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-08-18  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkrecentchooser.c (gtk_recent_chooser_get_uris): Behave as
+       documented and always return a NULL-terminated array.
+
+       * gtk/gtkrecentmanager.c (gtk_recent_manager_real_changed): Make sure
+       to reset write_in_progress.  
+
 2006-08-17  Matthias Clasen  <mclasen@redhat.com>
 
        * configure.in: Bump version

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index adb0a9e1ab8c9e458183cdce811cbf5ee1e5402b..52342f0e544150b43a48126c6b9160d7ea17fe9d 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+2006-08-18  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkrecentchooser.c (gtk_recent_chooser_get_uris): Behave as
+       documented and always return a NULL-terminated array.
+
+       * gtk/gtkrecentmanager.c (gtk_recent_manager_real_changed): Make sure
+       to reset write_in_progress.  
+
 2006-08-17  Matthias Clasen  <mclasen@redhat.com>
 
        * configure.in: Bump version

diff --git a/gtk/gtkrecentchooser.c b/gtk/gtkrecentchooser.c
index 06b5fdd7649f8e3648a09999effd30580c59a618..d8cc65e6d157070b20bad48d5dc74358b1ba5ed4 100644 (file)
--- a/gtk/gtkrecentchooser.c
+++ b/gtk/gtkrecentchooser.c
@@ -836,8 +836,6 @@ gtk_recent_chooser_get_uris (GtkRecentChooser *chooser,
   gsize n_items, i;
   
   items = gtk_recent_chooser_get_items (chooser);
-  if (!items)
-    return NULL;
   
   n_items = g_list_length (items);
   retval = g_new0 (gchar *, n_items + 1);

diff --git a/gtk/gtkrecentmanager.c b/gtk/gtkrecentmanager.c
index a41cd12dc4d7c43e6338cfcfb5152641674f5834..aadeb60418647df16e6abf6daa2045769cfc5e22 100644 (file)
--- a/gtk/gtkrecentmanager.c
+++ b/gtk/gtkrecentmanager.c
@@ -402,6 +402,7 @@ gtk_recent_manager_real_changed (GtkRecentManager *manager)
       g_bookmark_file_to_file (priv->recent_items,
                               priv->filename,
                               &write_error);
+
       if (write_error)
         {
           filename_warning ("Attempting to store changes into `%s', "
@@ -411,6 +412,8 @@ gtk_recent_manager_real_changed (GtkRecentManager *manager)
          g_error_free (write_error);
        }
 
+      priv->write_in_progress = FALSE;
+         
       /* we have sync'ed our list with the storage file, so we
        * update the file mtime in order to skip the timed check
        * and spare us from a re-read.
@@ -422,8 +425,6 @@ gtk_recent_manager_real_changed (GtkRecentManager *manager)
                            priv->filename,
                            g_strerror (errno));
 
-         priv->write_in_progress = FALSE;
-         
          g_object_thaw_notify (G_OBJECT (manager));
 
          return;