[Goodies-commits] r4750 - xfce4-taskmanager/trunk/src

[Mike Massonnet]

Author: mmassonnet
Date: 2008-05-09 11:01:37 +0000 (Fri, 09 May 2008)
New Revision: 4750

Modified:
   xfce4-taskmanager/trunk/src/callbacks.c
   xfce4-taskmanager/trunk/src/callbacks.h
   xfce4-taskmanager/trunk/src/interface.c
Log:
Fix the event of the mainmenu to display on keyboard and mouse


Modified: xfce4-taskmanager/trunk/src/callbacks.c
===================================================================
--- xfce4-taskmanager/trunk/src/callbacks.c	2008-05-09 11:01:32 UTC (rev 4749)
+++ xfce4-taskmanager/trunk/src/callbacks.c	2008-05-09 11:01:37 UTC (rev 4750)
@@ -21,12 +21,11 @@
 #include "callbacks.h"
 #include "menu-positions.h"
 
-void on_button1_button_press_event(GtkButton *button, GdkEventButton *event)
+void on_button1_activate(GtkButton *button)
 {
-	GdkEventButton *mouseevent = (GdkEventButton *)event;
 	if(mainmenu == NULL)
 		mainmenu = create_mainmenu();
-	gtk_menu_popup(GTK_MENU(mainmenu), NULL, NULL, (GtkMenuPositionFunc)position_mainmenu, button, mouseevent->button, mouseevent->time);
+	gtk_menu_popup(GTK_MENU(mainmenu), NULL, NULL, (GtkMenuPositionFunc)position_mainmenu, button, 0, gtk_get_current_event_time());
 }
 
 void on_button3_toggled_event(GtkButton *button, GdkEventButton *event)

Modified: xfce4-taskmanager/trunk/src/callbacks.h
===================================================================
--- xfce4-taskmanager/trunk/src/callbacks.h	2008-05-09 11:01:32 UTC (rev 4749)
+++ xfce4-taskmanager/trunk/src/callbacks.h	2008-05-09 11:01:37 UTC (rev 4750)
@@ -33,7 +33,7 @@
 
 #include "xfce-taskmanager-linux.h"
 
-void on_button1_button_press_event(GtkButton *button, GdkEventButton *event);
+void on_button1_activate(GtkButton *button);
 void on_button3_toggled_event(GtkButton *button, GdkEventButton *event);
 gboolean on_treeview1_button_press_event(GtkButton *button, GdkEventButton *event);
 void on_info1_activate (GtkMenuItem *menuitem,  gpointer user_data);

Modified: xfce4-taskmanager/trunk/src/interface.c
===================================================================
--- xfce4-taskmanager/trunk/src/interface.c	2008-05-09 11:01:32 UTC (rev 4749)
+++ xfce4-taskmanager/trunk/src/interface.c	2008-05-09 11:01:37 UTC (rev 4750)
@@ -110,7 +110,7 @@
 	g_signal_connect ((gpointer) window, "delete-event", G_CALLBACK (on_quit), NULL);
 	g_signal_connect_swapped ((gpointer) treeview, "button-press-event", G_CALLBACK(on_treeview1_button_press_event), NULL);
 	g_signal_connect ((gpointer) button1, "clicked",  G_CALLBACK (on_quit),  NULL);
-	g_signal_connect ((gpointer) button2, "button_release_event",  G_CALLBACK (on_button1_button_press_event),  NULL);
+	g_signal_connect ((gpointer) button2, "clicked",  G_CALLBACK (on_button1_activate),  NULL);
 	g_signal_connect ((gpointer) button3, "toggled",  G_CALLBACK (on_button3_toggled_event),  NULL);
 
 	return window;