diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | src/bookmarks/ephy-topic-action.c | 8 | ||||
| -rw-r--r-- | src/ephy-tab.c | 3 |
3 files changed, 17 insertions, 6 deletions
@@ -1,5 +1,17 @@ 2003-07-22 Christian Persch <chpe@cvs.gnome.org> + * src/ephy-tab.c: (ephy_tab_set_title): + + If the page is about:blank, set title to "Blank page", not "about:blank". + + * src/bookmarks/ephy-topic-action.c: (append_bookmarks_menu), + (build_topics_menu): + + If there are no uncategorised bookmarks, don't append insensitive + "Empty" menu item after the topics. + +2003-07-22 Christian Persch <chpe@cvs.gnome.org> + * lib/widgets/ephy-event-box.h: * lib/widgets/ephy-event-box.c: diff --git a/src/bookmarks/ephy-topic-action.c b/src/bookmarks/ephy-topic-action.c index cc522b967..bd77c1a65 100644 --- a/src/bookmarks/ephy-topic-action.c +++ b/src/bookmarks/ephy-topic-action.c @@ -192,7 +192,7 @@ sort_bookmarks (gconstpointer a, gconstpointer b) #define MAX_LENGTH 32 static void -append_bookmarks_menu (EphyTopicAction *action, GtkWidget *menu, EphyNode *node) +append_bookmarks_menu (EphyTopicAction *action, GtkWidget *menu, EphyNode *node, gboolean show_empty) { EphyFaviconCache *cache; GtkWidget *item; @@ -203,7 +203,7 @@ append_bookmarks_menu (EphyTopicAction *action, GtkWidget *menu, EphyNode *node) children = ephy_node_get_children (node); - if (children->len < 1) + if (children->len < 1 && show_empty) { item = gtk_menu_item_new_with_label (_("Empty")); gtk_widget_set_sensitive (item, FALSE); @@ -279,7 +279,7 @@ build_bookmarks_menu (EphyTopicAction *action, EphyNode *node) menu = gtk_menu_new (); - append_bookmarks_menu (action, menu, node); + append_bookmarks_menu (action, menu, node, TRUE); return menu; } @@ -369,7 +369,7 @@ build_topics_menu (EphyTopicAction *action, EphyNode *node) g_list_free (node_list); uncategorized = ephy_bookmarks_get_not_categorized (bookmarks); - append_bookmarks_menu (action, menu, uncategorized); + append_bookmarks_menu (action, menu, uncategorized, FALSE); return menu; } diff --git a/src/ephy-tab.c b/src/ephy-tab.c index 270fd6cb3..d4256ff89 100644 --- a/src/ephy-tab.c +++ b/src/ephy-tab.c @@ -1139,7 +1139,7 @@ ephy_tab_set_title (EphyTab *tab, const char *new_title) GNOME_VFS_URI_HIDE_FRAGMENT_IDENTIFIER); gnome_vfs_uri_unref (uri); } - else if (address != NULL) + else if (address != NULL && strncmp (address, "about:blank", 11) != 0) { title = g_strdup (address); } @@ -1150,7 +1150,6 @@ ephy_tab_set_title (EphyTab *tab, const char *new_title) title = g_strdup (_("Blank page")); } - g_free (address); } else |