aboutsummaryrefslogtreecommitdiffstats
path: root/src/bookmarks
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2004-02-05 07:30:02 +0800
committerChristian Persch <chpe@src.gnome.org>2004-02-05 07:30:02 +0800
commit46870c904459123bab2c4dd2801933bcb0141b80 (patch)
tree59e3a96367329d224c67685f2b0b08c6a018113b /src/bookmarks
parent0c598aa8e3fd37f4cb2e7b16957b06ac78b710ce (diff)
downloadgsoc2013-epiphany-46870c904459123bab2c4dd2801933bcb0141b80.tar
gsoc2013-epiphany-46870c904459123bab2c4dd2801933bcb0141b80.tar.gz
gsoc2013-epiphany-46870c904459123bab2c4dd2801933bcb0141b80.tar.bz2
gsoc2013-epiphany-46870c904459123bab2c4dd2801933bcb0141b80.tar.lz
gsoc2013-epiphany-46870c904459123bab2c4dd2801933bcb0141b80.tar.xz
gsoc2013-epiphany-46870c904459123bab2c4dd2801933bcb0141b80.tar.zst
gsoc2013-epiphany-46870c904459123bab2c4dd2801933bcb0141b80.zip
No need to connect to the toolitem's create-menu-proxy signal, gtk+ does
2004-02-05 Christian Persch <chpe@cvs.gnome.org> * src/bookmarks/ephy-bookmark-action.c: (connect_proxy): * src/bookmarks/ephy-topic-action.c: (connect_proxy): No need to connect to the toolitem's create-menu-proxy signal, gtk+ does it for us.
Diffstat (limited to 'src/bookmarks')
-rw-r--r--src/bookmarks/ephy-bookmark-action.c27
-rw-r--r--src/bookmarks/ephy-topic-action.c24
2 files changed, 2 insertions, 49 deletions
diff --git a/src/bookmarks/ephy-bookmark-action.c b/src/bookmarks/ephy-bookmark-action.c
index d3929b00b..7d7c27f0e 100644
--- a/src/bookmarks/ephy-bookmark-action.c
+++ b/src/bookmarks/ephy-bookmark-action.c
@@ -14,6 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * $Id$
*/
#ifdef HAVE_CONFIG_H
@@ -298,29 +300,6 @@ activate_cb (GtkWidget *widget, GtkAction *action)
g_free (text);
}
-static gboolean
-create_menu_proxy (GtkToolItem *item, GtkAction *action)
-{
- EphyBookmarkAction *bm_action = EPHY_BOOKMARK_ACTION (action);
- GtkWidget *menu_item;
- char *menu_id;
-
- LOG ("create_menu_proxy item %p, action %p", item, action);
-
- menu_item = GTK_ACTION_GET_CLASS (action)->create_menu_item (action);
-
- GTK_ACTION_GET_CLASS (action)->connect_proxy (action, menu_item);
-
- menu_id = g_strdup_printf ("ephy-bookmark-action-%d-menu-id",
- bm_action->priv->bookmark_id);
-
- gtk_tool_item_set_proxy_menu_item (item, menu_id, menu_item);
-
- g_free (menu_id);
-
- return TRUE;
-}
-
static void
connect_proxy (GtkAction *action, GtkWidget *proxy)
{
@@ -349,8 +328,6 @@ connect_proxy (GtkAction *action, GtkWidget *proxy)
entry = GTK_WIDGET (g_object_get_data (G_OBJECT (proxy), "entry"));
g_signal_connect (entry, "activate", G_CALLBACK (activate_cb), action);
-
- g_signal_connect (proxy, "create_menu_proxy", G_CALLBACK (create_menu_proxy), action);
}
else if (GTK_IS_MENU_ITEM (proxy))
{
diff --git a/src/bookmarks/ephy-topic-action.c b/src/bookmarks/ephy-topic-action.c
index 572fede52..095cf250c 100644
--- a/src/bookmarks/ephy-topic-action.c
+++ b/src/bookmarks/ephy-topic-action.c
@@ -481,26 +481,6 @@ create_menu_item (GtkAction *action)
return menu_item;
}
-static gboolean
-create_menu_proxy (GtkToolItem *item, GtkAction *action)
-{
- GtkWidget *menu_item;
- char *menu_id;
-
- LOG ("create_menu_proxy item %p, action %p", item, action)
-
- menu_item = create_menu_item (action);
-
- menu_id = g_strdup_printf ("ephy-topic-action-%d-menu-id",
- EPHY_TOPIC_ACTION (action)->priv->topic_id);
-
- gtk_tool_item_set_proxy_menu_item (item, menu_id, menu_item);
-
- g_free (menu_id);
-
- return TRUE;
-}
-
static void
connect_proxy (GtkAction *action, GtkWidget *proxy)
{
@@ -516,10 +496,6 @@ connect_proxy (GtkAction *action, GtkWidget *proxy)
if (GTK_IS_TOOL_ITEM (proxy))
{
- g_signal_connect_object (proxy, "create_menu_proxy",
- G_CALLBACK (create_menu_proxy),
- action, 0);
-
button = GTK_WIDGET (g_object_get_data (G_OBJECT (proxy), "button"));
g_signal_connect (button, "toggled",
G_CALLBACK (button_toggled_cb), action);