[hackers] [surf] deprecating signal “populate-popup” for “context-menu” || Quentin Rameau

From: <git_AT_suckless.org>
Date: Sat, 08 Feb 2014 20:11:13 +0100

commit a8267f7b95f0dd7e830ed89511f49ca515e4f594
Author: Quentin Rameau <quinq.ml_AT_gmail.com>
Date: Fri Feb 7 02:17:43 2014 +0100

    deprecating signal “populate-popup” for “context-menu”
    
    Signed-off-by: Christoph Lohmann <20h_AT_r-36.net>

diff --git a/surf.c b/surf.c
index 1534f5c..654353d 100644
--- a/surf.c
+++ b/surf.c
_AT_@ -29,7 +29,7 @@
 char *argv0;
 
 #define LENGTH(x) (sizeof x / sizeof x[0])
-#define CLEANMASK(mask) (mask & (MODKEY|GDK_SHIFT_MASK))
+#define CLEANMASK(mask) (mask & (MODKEY|GDK_SHIFT_MASK))
 #define COOKIEJAR_TYPE (cookiejar_get_type ())
 #define COOKIEJAR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), COOKIEJAR_TYPE, CookieJar))
 
_AT_@ -148,8 +148,9 @@ static void navigate(Client *c, const Arg *arg);
 static Client *newclient(void);
 static void newwindow(Client *c, const Arg *arg, gboolean noembed);
 static void pasteuri(GtkClipboard *clipboard, const char *text, gpointer d);
-static void populatepopup(WebKitWebView *web, GtkMenu *menu, Client *c);
-static void popupactivate(GtkMenuItem *menu, Client *);
+static gboolean contextmenu(WebKitWebView *view, GtkWidget *menu,
+ WebKitHitTestResult *target, gboolean keyboard, Client *c);
+static void menuactivate(GtkMenuItem *item, Client *c);
 static void print(Client *c, const Arg *arg);
 static GdkFilterReturn processx(GdkXEvent *xevent, GdkEvent *event,
                 gpointer d);
_AT_@ -781,8 +782,8 @@ newclient(void) {
                         "button-release-event",
                         G_CALLBACK(buttonrelease), c);
         g_signal_connect(G_OBJECT(c->view),
- "populate-popup",
- G_CALLBACK(populatepopup), c);
+ "context-menu",
+ G_CALLBACK(contextmenu), c);
         g_signal_connect(G_OBJECT(c->view),
                         "resource-request-starting",
                         G_CALLBACK(beforerequest), c);
_AT_@ -945,19 +946,21 @@ newwindow(Client *c, const Arg *arg, gboolean noembed) {
         spawn(NULL, &a);
 }
 
-static void
-populatepopup(WebKitWebView *web, GtkMenu *menu, Client *c) {
- GList *items = gtk_container_get_children(GTK_CONTAINER(menu));
+static gboolean
+contextmenu(WebKitWebView *view, GtkWidget *menu, WebKitHitTestResult *target,
+ gboolean keyboard, Client *c) {
+ GList *items = gtk_container_get_children(GTK_CONTAINER(GTK_MENU(menu)));
 
         for(GList *l = items; l; l = l->next) {
- g_signal_connect(l->data, "activate", G_CALLBACK(popupactivate), c);
+ g_signal_connect(l->data, "activate", G_CALLBACK(menuactivate), c);
         }
 
         g_list_free(items);
+ return FALSE;
 }
 
 static void
-popupactivate(GtkMenuItem *menu, Client *c) {
+menuactivate(GtkMenuItem *item, Client *c) {
         /*
          * context-menu-action-2000 open link
          * context-menu-action-1 open link in window
_AT_@ -973,7 +976,7 @@ popupactivate(GtkMenuItem *menu, Client *c) {
         const char *name;
         GtkClipboard *prisel;
 
- a = gtk_activatable_get_related_action(GTK_ACTIVATABLE(menu));
+ a = gtk_activatable_get_related_action(GTK_ACTIVATABLE(item));
         if(a == NULL)
                 return;
 
Received on Sat Feb 08 2014 - 20:11:13 CET