diff options
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 14 | ||||
| -rw-r--r-- | gtk/gtkrecentchooserdefault.c | 6 | ||||
| -rw-r--r-- | gtk/gtkrecentchoosermenu.c | 49 |
4 files changed, 55 insertions, 28 deletions
@@ -1,3 +1,17 @@ +2006-08-07 Emmanuele Bassi <ebassi@gnome.org> + + * gtk/gtkrecentchooserdefault.c: + (_gtk_recent_chooser_default_init): Show non existing + resources by default. + (recent_meta_data_func): Do not mark non existing + resources as insensitive. + + * gtk/gtkrecentchoosermenu.c: + (gtk_recent_chooser_menu_init): Show non existing + resources by default. + (gtk_recent_chooser_menu_create_item): Do not mark + non existing resources as insensitive. + 2006-08-06 Matthias Clasen <mclasen@redhat.com> * gdk/x11/gdkkeys-x11.c (gdk_keymap_x11_finalize): Free diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 8870fced5a..2d847b49a3 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,17 @@ +2006-08-07 Emmanuele Bassi <ebassi@gnome.org> + + * gtk/gtkrecentchooserdefault.c: + (_gtk_recent_chooser_default_init): Show non existing + resources by default. + (recent_meta_data_func): Do not mark non existing + resources as insensitive. + + * gtk/gtkrecentchoosermenu.c: + (gtk_recent_chooser_menu_init): Show non existing + resources by default. + (gtk_recent_chooser_menu_create_item): Do not mark + non existing resources as insensitive. + 2006-08-06 Matthias Clasen <mclasen@redhat.com> * gdk/x11/gdkkeys-x11.c (gdk_keymap_x11_finalize): Free diff --git a/gtk/gtkrecentchooserdefault.c b/gtk/gtkrecentchooserdefault.c index 46df22555a..de89c664d6 100644 --- a/gtk/gtkrecentchooserdefault.c +++ b/gtk/gtkrecentchooserdefault.c @@ -341,7 +341,7 @@ _gtk_recent_chooser_default_init (GtkRecentChooserDefault *impl) impl->show_icons = TRUE; impl->show_private = FALSE; - impl->show_not_found = FALSE; + impl->show_not_found = TRUE; impl->show_tips = TRUE; impl->select_multiple = FALSE; impl->local_only = TRUE; @@ -1010,7 +1010,6 @@ recent_meta_data_func (GtkTreeViewColumn *tree_column, g_object_set (cell, "markup", data->str, - "sensitive", gtk_recent_info_exists (info), NULL); g_string_free (data, TRUE); @@ -1341,9 +1340,6 @@ gtk_recent_chooser_default_get_items (GtkRecentChooser *chooser) clamp = g_list_nth (items, limit - 1); - if (!clamp) - return items; - l = clamp->next; clamp->next = NULL; diff --git a/gtk/gtkrecentchoosermenu.c b/gtk/gtkrecentchoosermenu.c index ae5a0149c2..54ee86302e 100644 --- a/gtk/gtkrecentchoosermenu.c +++ b/gtk/gtkrecentchoosermenu.c @@ -225,7 +225,7 @@ gtk_recent_chooser_menu_init (GtkRecentChooserMenu *menu) priv->show_icons= TRUE; priv->show_numbers = FALSE; priv->show_tips = FALSE; - priv->show_not_found = FALSE; + priv->show_not_found = TRUE; priv->show_private = FALSE; priv->local_only = TRUE; @@ -636,12 +636,12 @@ gtk_recent_chooser_menu_get_items (GtkRecentChooser *chooser) if (compare_func) items = g_list_sort_with_data (items, compare_func, menu); - + length = g_list_length (items); if ((limit != -1) && (length > limit)) { GList *clamp, *l; - + clamp = g_list_nth (items, limit - 1); l = clamp->next; @@ -650,7 +650,7 @@ gtk_recent_chooser_menu_get_items (GtkRecentChooser *chooser) g_list_foreach (l, (GFunc) gtk_recent_info_unref, NULL); g_list_free (l); } - + return items; } @@ -888,14 +888,7 @@ gtk_recent_chooser_menu_create_item (GtkRecentChooserMenu *menu, image = gtk_image_new_from_pixbuf (icon); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image); } - - if (!gtk_recent_info_exists (info)) - { - gtk_widget_set_sensitive (item, FALSE); - - goto out; - } - + g_signal_connect (item, "activate", G_CALLBACK (item_activate_cb), menu); @@ -994,21 +987,31 @@ idle_populate_func (gpointer data) priv = pdata->menu->priv; /* skip non-local items on request */ - if (priv->local_only && !gtk_recent_info_is_local (info)) - goto check_and_return; + if (priv->local_only && + !gtk_recent_info_is_local (info)) + { + goto check_and_return; + } /* skip private items on request */ - if (!priv->show_private && gtk_recent_info_get_private_hint (info)) - goto check_and_return; - - /* skip non-existing items on request */ - if (!priv->show_not_found && !gtk_recent_info_exists (info)) - goto check_and_return; + if (!priv->show_private && + gtk_recent_info_get_private_hint (info)) + { + goto check_and_return; + } + /* skip non-existing items on request */ + if (!priv->show_not_found && + !gtk_recent_info_exists (info)) + { + goto check_and_return; + } /* filter items based on the currently set filter object */ if (get_is_recent_filtered (pdata->menu, info)) - goto check_and_return; - + { + goto check_and_return; + } + item = gtk_recent_chooser_menu_create_item (pdata->menu, info, pdata->loaded_items); @@ -1037,7 +1040,7 @@ idle_populate_func (gpointer data) g_object_set_data_full (G_OBJECT (item), "gtk-recent-info", gtk_recent_info_ref (info), (GDestroyNotify) gtk_recent_info_unref); - + check_and_return: pdata->loaded_items += 1; |