diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | src/bookmarks/ephy-bookmarks-editor.c | 2 | ||||
| -rw-r--r-- | src/ephy-history-window.c | 2 | ||||
| -rw-r--r-- | src/ephy-shell.c | 3 | ||||
| -rw-r--r-- | src/ephy-shell.h | 25 |
5 files changed, 28 insertions, 15 deletions
@@ -1,3 +1,14 @@ +2003-04-30 Xan Lopez <xan@masilla.org> + + * src/bookmarks/ephy-bookmarks-editor.c: + (cmd_open_bookmarks_in_tabs): + * src/ephy-history-window.c: (cmd_open_bookmarks_in_tabs): + * src/ephy-shell.c: (ephy_shell_new_tab): + * src/ephy-shell.h: + + Respect all the new_tab used flags, drop unused ones. + Patch by Christian Perch <chpe+gnomebugz@stud.uni-saarland.de> + 2003-04-29 David Bordoley <bordoley@msu.edu> * data/ui/epiphany-ui.xml.in: diff --git a/src/bookmarks/ephy-bookmarks-editor.c b/src/bookmarks/ephy-bookmarks-editor.c index dd6aa9158..eca629938 100644 --- a/src/bookmarks/ephy-bookmarks-editor.c +++ b/src/bookmarks/ephy-bookmarks-editor.c @@ -347,7 +347,7 @@ cmd_open_bookmarks_in_tabs (EggAction *action, EPHY_NODE_BMK_PROP_LOCATION); ephy_shell_new_tab (ephy_shell, window, NULL, location, - EPHY_NEW_TAB_APPEND|EPHY_NEW_TAB_IN_EXISTING_WINDOW); + EPHY_NEW_TAB_APPEND_GROUPED | EPHY_NEW_TAB_IN_EXISTING_WINDOW); } g_list_free (selection); diff --git a/src/ephy-history-window.c b/src/ephy-history-window.c index 120ab70e1..36c9a013f 100644 --- a/src/ephy-history-window.c +++ b/src/ephy-history-window.c @@ -236,7 +236,7 @@ cmd_open_bookmarks_in_tabs (EggAction *action, EPHY_NODE_PAGE_PROP_LOCATION); ephy_shell_new_tab (ephy_shell, window, NULL, location, - EPHY_NEW_TAB_APPEND|EPHY_NEW_TAB_IN_EXISTING_WINDOW); + EPHY_NEW_TAB_APPEND_GROUPED | EPHY_NEW_TAB_IN_EXISTING_WINDOW); } g_list_free (selection); diff --git a/src/ephy-shell.c b/src/ephy-shell.c index 51b53c7d6..c37aa8b31 100644 --- a/src/ephy-shell.c +++ b/src/ephy-shell.c @@ -522,6 +522,9 @@ ephy_shell_new_tab (EphyShell *shell, grouped = TRUE; } + if (flags & EPHY_NEW_TAB_APPEND_GROUPED) grouped = TRUE; + if (flags & EPHY_NEW_TAB_APPEND_LAST) grouped = FALSE; + tab = ephy_tab_new (); embed = ephy_tab_get_embed (tab); gtk_widget_show (GTK_WIDGET(embed)); diff --git a/src/ephy-shell.h b/src/ephy-shell.h index 06bc65cce..d4654a002 100644 --- a/src/ephy-shell.h +++ b/src/ephy-shell.h @@ -51,19 +51,18 @@ extern EphyShell *ephy_shell; typedef enum { - EPHY_NEW_TAB_HOMEPAGE = 1 << 0, - EPHY_NEW_TAB_FULLSCREEN = 1 << 1, - EPHY_NEW_TAB_APPEND = 1 << 2, - EPHY_NEW_TAB_PREPEND = 1 << 3, - EPHY_NEW_TAB_APPEND_AFTER_CURRENT = 1 << 4, - EPHY_NEW_TAB_JUMP = 1 << 5, - EPHY_NEW_TAB_DONT_JUMP_TO = 1 << 6, - EPHY_NEW_TAB_RAISE_WINDOW = 1 << 7, - EPHY_NEW_TAB_DONT_RAISE_WINDOW = 1 << 8, - EPHY_NEW_TAB_IN_NEW_WINDOW = 1 << 9, - EPHY_NEW_TAB_IN_EXISTING_WINDOW = 1 << 10, - EPHY_NEW_TAB_IS_A_COPY = 1 << 11, - EPHY_NEW_TAB_VIEW_SOURCE = 1 << 12 + EPHY_NEW_TAB_HOMEPAGE = 1 << 0, + EPHY_NEW_TAB_FULLSCREEN = 1 << 1, + EPHY_NEW_TAB_APPEND_GROUPED = 1 << 2, + EPHY_NEW_TAB_APPEND_LAST = 1 << 3, + EPHY_NEW_TAB_JUMP = 1 << 4, + EPHY_NEW_TAB_DONT_JUMP_TO = 1 << 5, + EPHY_NEW_TAB_RAISE_WINDOW = 1 << 6, + EPHY_NEW_TAB_DONT_RAISE_WINDOW = 1 << 7, + EPHY_NEW_TAB_IN_NEW_WINDOW = 1 << 8, + EPHY_NEW_TAB_IN_EXISTING_WINDOW = 1 << 9, + EPHY_NEW_TAB_IS_A_COPY = 1 << 10, + EPHY_NEW_TAB_VIEW_SOURCE = 1 << 11 } EphyNewTabFlags; struct EphyShell |