1 files changed, 36 insertions, 18 deletions

diff --git a/src/namestore/gnunet-namestore-gtk.c b/src/namestore/gnunet-namestore-gtk.c
index 60ab84d5..0cec62b4 100644
--- a/src/namestore/gnunet-namestore-gtk.c
+++ b/src/namestore/gnunet-namestore-gtk.c
@@ -1914,9 +1914,9 @@ gnunet_namestore_gtk_name_cellrenderertext_edited_cb (GtkCellRendererText *rende
  * Create a context (popup) menu for the zone iteration treeview
  * (if applicable).
  *
- * @return TRUE if a menu was activated
+ * @return NULL if no menu could be created
  */
-static gboolean
+static GtkMenu *
 create_popup_menu ()
 {
   GtkTreeIter it;
@@ -1931,7 +1931,7 @@ create_popup_menu ()
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "No row selected\n");
-    return FALSE;
+    return NULL;
   }
   gtk_tree_model_get (tm, &it,
                       GNS_TREESTORE_COL_NAME_IS_VISIBLE, &name_vis,
@@ -1940,12 +1940,11 @@ create_popup_menu ()
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Selected row is not a record row\n");
-    return FALSE;
+    return NULL;
   }
   popup  = GTK_MENU (get_object ("gnunet_namestore_gtk_edit_popup_menu"));
   gtk_widget_show_all (GTK_WIDGET (popup));
-  gtk_menu_popup (popup, NULL, NULL, NULL, NULL, 0, 0);
-  return TRUE;
+  return popup;
 }
 
 
@@ -1961,9 +1960,19 @@ create_popup_menu ()
  */
 gboolean
 gnunet_namestore_gtk_treeview_popup_menu_cb (GtkWidget *widget,
-                                                      gpointer user_data)
+                                             gpointer user_data)
 {
-  return create_popup_menu ();
+  GtkMenu *menu;
+
+  menu = create_popup_menu ();
+  if (NULL == menu)
+    return FALSE;
+  gtk_menu_popup_at_widget (menu,
+                            widget,
+                            GDK_GRAVITY_CENTER,
+                            GDK_GRAVITY_CENTER,
+                            NULL);
+  return TRUE;
 }
 
 
@@ -1978,16 +1987,24 @@ gnunet_namestore_gtk_treeview_popup_menu_cb (GtkWidget *widget,
  */
 gboolean
 gnunet_namestore_gtk_treeview_button_press_event_cb (GtkWidget *widget,
-                                                      GdkEventButton *event,
-                                                      gpointer user_data)
+                                                     GdkEvent *event,
+                                                     gpointer user_data)
 {
+  GdkEventButton *event_button = (GdkEventButton *) event;
+  GtkMenu *menu;
+
   /* Check for right click*/
   if (NULL == widget)
     return FALSE;
-  if ( (GDK_BUTTON_PRESS == event->type) &&
-       (3 == event->button) )
-    return create_popup_menu ();
-  return FALSE;
+  if ( (GDK_BUTTON_PRESS != event_button->type) ||
+       (3 != event_button->button) )
+    return FALSE;
+  menu = create_popup_menu ();
+  if (NULL == menu)
+    return FALSE;
+  gtk_menu_popup_at_pointer (menu,
+                             event);
+  return TRUE;
 }
 
 
@@ -2002,9 +2019,10 @@ gnunet_namestore_gtk_treeview_button_press_event_cb (GtkWidget *widget,
  */
 gboolean
 gnunet_namestore_gtk_treeview_key_press_event_cb (GtkWidget *widget,
-                                                  GdkEventKey *event,
+                                                  GdkEvent *event,
                                                   gpointer user_data)
 {
+  GdkEventKey *event_key = (GdkEventKey *) event;
   GtkTreeIter iter;
   GtkTreeSelection *sel;
   int not_dummy;
@@ -2015,10 +2033,10 @@ gnunet_namestore_gtk_treeview_key_press_event_cb (GtkWidget *widget,
   struct OperationContext *oc;
 
   /* Check for delete key */
-  if ( (GDK_KEY_PRESS != event->type) ||
-       (GDK_KEY_Delete != event->keyval) )
+  if ( (GDK_KEY_PRESS != event_key->type) ||
+       (GDK_KEY_Delete != event_key->keyval) )
     return FALSE;
-  sel = gtk_tree_view_get_selection(tv);
+  sel = gtk_tree_view_get_selection (tv);
   if (! gtk_tree_selection_get_selected (sel, NULL, &iter))
     return TRUE; /* nothing selected */
   gtk_tree_model_get (tm, &iter,