aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@gnome.org>2003-09-12 06:02:28 +0800
committerMarco Pesenti Gritti <marco@src.gnome.org>2003-09-12 06:02:28 +0800
commitc93cd13f059815bfa8f1d2f23820d0c62796c15d (patch)
treeadbb6858c6a2664c28f9d8a340a8104a8c1d49f2
parent9345135208e277113cc014c355b2360e0689d51b (diff)
downloadgsoc2013-epiphany-c93cd13f059815bfa8f1d2f23820d0c62796c15d.tar
gsoc2013-epiphany-c93cd13f059815bfa8f1d2f23820d0c62796c15d.tar.gz
gsoc2013-epiphany-c93cd13f059815bfa8f1d2f23820d0c62796c15d.tar.bz2
gsoc2013-epiphany-c93cd13f059815bfa8f1d2f23820d0c62796c15d.tar.lz
gsoc2013-epiphany-c93cd13f059815bfa8f1d2f23820d0c62796c15d.tar.xz
gsoc2013-epiphany-c93cd13f059815bfa8f1d2f23820d0c62796c15d.tar.zst
gsoc2013-epiphany-c93cd13f059815bfa8f1d2f23820d0c62796c15d.zip
Remove not needed removal of groups of actions from ui merge (gtk fix).
2003-09-11 Marco Pesenti Gritti <marco@gnome.org> * src/bookmarks/ephy-bookmarks-editor.c: (ephy_bookmarks_editor_finalize): * src/bookmarks/ephy-bookmarks-menu.c: (ephy_bookmarks_menu_finalize): * src/ephy-encoding-menu.c: (ephy_encoding_menu_finalize_impl): * src/ephy-favorites-menu.c: (ephy_favorites_menu_finalize): * src/ephy-history-window.c: (ephy_history_window_finalize): * src/ephy-tabs-menu.c: (ephy_tabs_menu_finalize_impl): * src/ephy-window.c: (ephy_window_finalize): * src/toolbar.c: (toolbar_finalize): Remove not needed removal of groups of actions from ui merge (gtk fix).
-rw-r--r--ChangeLog16
-rw-r--r--src/bookmarks/ephy-bookmarks-editor.c2
-rw-r--r--src/bookmarks/ephy-bookmarks-menu.c2
-rw-r--r--src/ephy-encoding-menu.c3
-rw-r--r--src/ephy-favorites-menu.c3
-rw-r--r--src/ephy-history-window.c2
-rw-r--r--src/ephy-tabs-menu.c3
-rw-r--r--src/ephy-window.c2
-rwxr-xr-xsrc/toolbar.c1
9 files changed, 16 insertions, 18 deletions
diff --git a/ChangeLog b/ChangeLog
index 314a0a91a..073621a02 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,21 @@
2003-09-11 Marco Pesenti Gritti <marco@gnome.org>
+ * src/bookmarks/ephy-bookmarks-editor.c:
+ (ephy_bookmarks_editor_finalize):
+ * src/bookmarks/ephy-bookmarks-menu.c:
+ (ephy_bookmarks_menu_finalize):
+ * src/ephy-encoding-menu.c: (ephy_encoding_menu_finalize_impl):
+ * src/ephy-favorites-menu.c: (ephy_favorites_menu_finalize):
+ * src/ephy-history-window.c: (ephy_history_window_finalize):
+ * src/ephy-tabs-menu.c: (ephy_tabs_menu_finalize_impl):
+ * src/ephy-window.c: (ephy_window_finalize):
+ * src/toolbar.c: (toolbar_finalize):
+
+ Remove not needed removal of groups of actions from ui
+ merge (gtk fix).
+
+2003-09-11 Marco Pesenti Gritti <marco@gnome.org>
+
* lib/widgets/ephy-location-entry.c:
(ephy_location_entry_autocompletion_hide_alternatives),
(insert_text_cb),
diff --git a/src/bookmarks/ephy-bookmarks-editor.c b/src/bookmarks/ephy-bookmarks-editor.c
index 67eb6d491..cff704d7e 100644
--- a/src/bookmarks/ephy-bookmarks-editor.c
+++ b/src/bookmarks/ephy-bookmarks-editor.c
@@ -718,8 +718,6 @@ ephy_bookmarks_editor_finalize (GObject *object)
g_object_unref (G_OBJECT (editor->priv->bookmarks_filter));
g_object_unref (editor->priv->action_group);
- gtk_ui_manager_remove_action_group (editor->priv->ui_merge,
- editor->priv->action_group);
g_object_unref (editor->priv->ui_merge);
if (editor->priv->window)
diff --git a/src/bookmarks/ephy-bookmarks-menu.c b/src/bookmarks/ephy-bookmarks-menu.c
index 78d565983..6c1b2d86d 100644
--- a/src/bookmarks/ephy-bookmarks-menu.c
+++ b/src/bookmarks/ephy-bookmarks-menu.c
@@ -446,8 +446,6 @@ ephy_bookmarks_menu_finalize (GObject *o)
if (p->action_group != NULL)
{
- gtk_ui_manager_remove_action_group
- (p->merge, p->action_group);
g_object_unref (p->action_group);
}
diff --git a/src/ephy-encoding-menu.c b/src/ephy-encoding-menu.c
index f713c168b..f2b1b1e2c 100644
--- a/src/ephy-encoding-menu.c
+++ b/src/ephy-encoding-menu.c
@@ -134,9 +134,6 @@ ephy_encoding_menu_finalize_impl (GObject *o)
if (p->action_group != NULL)
{
- gtk_ui_manager_remove_action_group
- (GTK_UI_MANAGER (p->window->ui_merge),
- p->action_group);
g_object_unref (p->action_group);
}
diff --git a/src/ephy-favorites-menu.c b/src/ephy-favorites-menu.c
index 91c3375bb..c191b721e 100644
--- a/src/ephy-favorites-menu.c
+++ b/src/ephy-favorites-menu.c
@@ -239,9 +239,6 @@ ephy_favorites_menu_finalize (GObject *o)
if (p->action_group != NULL)
{
- gtk_ui_manager_remove_action_group
- (GTK_UI_MANAGER (p->window->ui_merge),
- p->action_group);
g_object_unref (p->action_group);
}
diff --git a/src/ephy-history-window.c b/src/ephy-history-window.c
index 7df319818..039bb3387 100644
--- a/src/ephy-history-window.c
+++ b/src/ephy-history-window.c
@@ -577,8 +577,6 @@ ephy_history_window_finalize (GObject *object)
g_object_unref (G_OBJECT (editor->priv->pages_filter));
g_object_unref (editor->priv->action_group);
- gtk_ui_manager_remove_action_group (editor->priv->ui_merge,
- editor->priv->action_group);
g_object_unref (editor->priv->ui_merge);
if (editor->priv->window)
diff --git a/src/ephy-tabs-menu.c b/src/ephy-tabs-menu.c
index c7f5b1ba8..91e1e2ff5 100644
--- a/src/ephy-tabs-menu.c
+++ b/src/ephy-tabs-menu.c
@@ -189,9 +189,6 @@ ephy_tabs_menu_finalize_impl (GObject *o)
if (p->action_group != NULL)
{
- gtk_ui_manager_remove_action_group
- (GTK_UI_MANAGER (p->window->ui_merge),
- p->action_group);
g_object_unref (p->action_group);
}
diff --git a/src/ephy-window.c b/src/ephy-window.c
index ab58630f1..2de01ea6d 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -1399,8 +1399,6 @@ ephy_window_finalize (GObject *object)
}
g_object_unref (window->priv->action_group);
- gtk_ui_manager_remove_action_group (GTK_UI_MANAGER (window->ui_merge),
- window->priv->action_group);
g_object_unref (window->ui_merge);
G_OBJECT_CLASS (parent_class)->finalize (object);
diff --git a/src/toolbar.c b/src/toolbar.c
index 10e03aa22..dc905c427 100755
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -523,7 +523,6 @@ toolbar_finalize (GObject *object)
G_OBJECT_CLASS (parent_class)->finalize (object);
g_object_unref (t->priv->action_group);
- gtk_ui_manager_remove_action_group (merge, t->priv->action_group);
LOG ("Toolbar finalized")
}