aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--src/bookmarks/ephy-bookmark-action.c27
-rw-r--r--src/bookmarks/ephy-topic-action.c24
3 files changed, 10 insertions, 49 deletions
diff --git a/ChangeLog b/ChangeLog
index 0a12fdd9c..2162959fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+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.
+
2004-02-04 Christian Persch <chpe@cvs.gnome.org>
* src/ephy-go-action.c: (ephy_go_action_get_type),
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);