[uim-commit] r380 - trunk/helper

[tkng@freedesktop.org]

Author: tkng
Date: 2005-01-28 09:56:46 -0800 (Fri, 28 Jan 2005)
New Revision: 380

Modified:
   trunk/helper/toolbar-common-gtk.c
Log:
* helper/toolbar-common-gtk.c:
 -(switcher_button_pressed): Process right click correctly.
 -(pref_button_pressed): Process right click correctly.
 --This line, and those below, will be ignored--

M    toolbar-common-gtk.c


Modified: trunk/helper/toolbar-common-gtk.c
===================================================================
--- trunk/helper/toolbar-common-gtk.c	2005-01-28 17:44:34 UTC (rev 379)
+++ trunk/helper/toolbar-common-gtk.c	2005-01-28 17:56:46 UTC (rev 380)
@@ -556,13 +556,15 @@
 static void
 switcher_button_pressed(GtkButton *prop_button, GdkEventButton *event, gpointer user_data)
 { 
-  if (event->button == 2 || event->button == 3) {
+  if(event->button == 3) {
+    prop_right_button_pressed(prop_button, event, prop_menu);
+  } else if(event->button == 2) {
     if (helper_parent_widget)
       gtk_propagate_event(GTK_WIDGET(helper_parent_widget), (GdkEvent *) event);
-    } else {
-      /* exec uim-im-switcher */
-      system("uim-im-switcher &");
-    }
+  } else {
+    /* exec uim-im-switcher */
+    system("uim-im-switcher &");
+  }
 }
 
 static GtkWidget *
@@ -590,13 +592,15 @@
 static void
 pref_button_pressed(GtkButton *prop_button, GdkEventButton *event, gpointer user_data)
 { 
-  if (event->button == 2 || event->button == 3) {
+  if(event->button == 3) {
+    prop_right_button_pressed(prop_button, event, prop_menu);
+  } else if(event->button == 2) {
     if (helper_parent_widget)
       gtk_propagate_event(GTK_WIDGET(helper_parent_widget), (GdkEvent *) event);
-    } else {
-      /* exec uim-pref */
-      system("uim-pref-gtk &");
-    }
+  } else {
+    /* exec uim-pref */
+    system("uim-pref-gtk &");
+  }
 }
 
 static void