diff options
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | src/ephy-automation.c | 2 | ||||
| -rw-r--r-- | src/ephy-shell.c | 18 | ||||
| -rw-r--r-- | src/ephy-shell.h | 30 | ||||
| -rw-r--r-- | src/window-commands.c | 4 |
5 files changed, 48 insertions, 19 deletions
@@ -1,5 +1,18 @@ 2003-04-28 Marco Pesenti Gritti <marco@it.gnome.org> + * src/ephy-automation.c: + (impl_ephy_automation_open_bookmarks_editor): + * src/ephy-shell.c: (ephy_shell_show_bookmarks_editor), + (ephy_shell_show_history_window): + * src/ephy-shell.h: + * src/window-commands.c: (window_cmd_go_bookmarks), + (window_cmd_go_history): + + Actually pass a parent to history/bookmarks window, where + to open the url. Bad who regressed this ;) + +2003-04-28 Marco Pesenti Gritti <marco@it.gnome.org> + * lib/egg/egg-menu-merge.c: (egg_menu_merge_finalize), (egg_menu_merge_class_init): diff --git a/src/ephy-automation.c b/src/ephy-automation.c index d03562adb..166ca245d 100644 --- a/src/ephy-automation.c +++ b/src/ephy-automation.c @@ -177,7 +177,7 @@ static void impl_ephy_automation_open_bookmarks_editor (PortableServer_Servant _servant, CORBA_Environment * ev) { - ephy_shell_show_bookmarks_editor (ephy_shell); + ephy_shell_show_bookmarks_editor (ephy_shell, NULL); } static void diff --git a/src/ephy-shell.c b/src/ephy-shell.c index 1e4bed077..04ac7eb6e 100644 --- a/src/ephy-shell.c +++ b/src/ephy-shell.c @@ -688,7 +688,8 @@ bookmarks_hide_cb (GtkWidget *widget, gpointer data) } void -ephy_shell_show_bookmarks_editor (EphyShell *gs) +ephy_shell_show_bookmarks_editor (EphyShell *gs, + GtkWidget *parent) { EphyBookmarks *bookmarks; @@ -707,6 +708,12 @@ ephy_shell_show_bookmarks_editor (EphyShell *gs) g_object_ref (ephy_shell); } + if (parent) + { + ephy_bookmarks_editor_set_parent + (EPHY_BOOKMARKS_EDITOR (gs->priv->bme), parent); + } + gtk_window_present (GTK_WINDOW (gs->priv->bme)); } @@ -718,7 +725,8 @@ history_window_hide_cb (GtkWidget *widget, gpointer data) } void -ephy_shell_show_history_window (EphyShell *gs) +ephy_shell_show_history_window (EphyShell *gs, + GtkWidget *parent) { EphyHistory *history; @@ -738,6 +746,12 @@ ephy_shell_show_history_window (EphyShell *gs) g_object_ref (ephy_shell); } + if (parent) + { + ephy_history_window_set_parent + (EPHY_HISTORY_WINDOW (gs->priv->history_window), parent); + } + gtk_window_present (GTK_WINDOW (gs->priv->history_window)); } diff --git a/src/ephy-shell.h b/src/ephy-shell.h index 6df099efb..06bc65cce 100644 --- a/src/ephy-shell.h +++ b/src/ephy-shell.h @@ -77,29 +77,31 @@ struct EphyShellClass EphyEmbedShellClass parent_class; }; -GType ephy_shell_get_type (void); +GType ephy_shell_get_type (void); -EphyShell *ephy_shell_new (void); +EphyShell *ephy_shell_new (void); -EphyWindow *ephy_shell_get_active_window (EphyShell *gs); +EphyWindow *ephy_shell_get_active_window (EphyShell *gs); -EphyTab *ephy_shell_new_tab (EphyShell *shell, - EphyWindow *parent_window, - EphyTab *previous_tab, - const char *url, - EphyNewTabFlags flags); +EphyTab *ephy_shell_new_tab (EphyShell *shell, + EphyWindow *parent_window, + EphyTab *previous_tab, + const char *url, + EphyNewTabFlags flags); -Session *ephy_shell_get_session (EphyShell *gs); +Session *ephy_shell_get_session (EphyShell *gs); -EphyAutocompletion *ephy_shell_get_autocompletion (EphyShell *gs); +EphyAutocompletion *ephy_shell_get_autocompletion (EphyShell *gs); -EphyBookmarks *ephy_shell_get_bookmarks (EphyShell *gs); +EphyBookmarks *ephy_shell_get_bookmarks (EphyShell *gs); -EphyToolbarsModel *ephy_shell_get_toolbars_model (EphyShell *gs); +EphyToolbarsModel *ephy_shell_get_toolbars_model (EphyShell *gs); -void ephy_shell_show_bookmarks_editor (EphyShell *gs); +void ephy_shell_show_bookmarks_editor (EphyShell *gs, + GtkWidget *parent); -void ephy_shell_show_history_window (EphyShell *gs); +void ephy_shell_show_history_window (EphyShell *gs, + GtkWidget *parent); G_END_DECLS diff --git a/src/window-commands.c b/src/window-commands.c index b6cf9e90e..557391704 100644 --- a/src/window-commands.c +++ b/src/window-commands.c @@ -247,7 +247,7 @@ void window_cmd_go_bookmarks (EggAction *action, EphyWindow *window) { - ephy_shell_show_bookmarks_editor (ephy_shell); + ephy_shell_show_bookmarks_editor (ephy_shell, GTK_WIDGET (window)); } void @@ -616,7 +616,7 @@ void window_cmd_go_history (EggAction *action, EphyWindow *window) { - ephy_shell_show_history_window (ephy_shell); + ephy_shell_show_history_window (ephy_shell, GTK_WIDGET (window)); } void |