Attachment 312020 Details for Bug 444711 – patch without the global variable

[patch] patch without the global variable

scim-1.4.7-menu-pos2.patch (text/plain), 3.05 KB, created by Akira TAGOH on 2008-07-17 09:27:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Akira TAGOH

Created: 2008-07-17 09:27:42 UTC

Size: 3.05 KB

patch

obsolete

>diff -pruN scim-1.4.7.orig/extras/panel/scim_panel_gtk.cpp scim-1.4.7/extras/panel/scim_panel_gtk.cpp
>--- scim-1.4.7.orig/extras/panel/scim_panel_gtk.cpp	2008-07-17 18:12:33.000000000 +0900
>+++ scim-1.4.7/extras/panel/scim_panel_gtk.cpp	2008-07-17 18:22:26.000000000 +0900
>@@ -304,7 +304,9 @@ static PangoAttrList * create_pango_attr
> // Action function
> static void       action_request_help                  (void);
> static void       action_toggle_window_stick           (void);
>-static void       action_show_command_menu             (void);
>+static void       action_show_command_menu             (GdkWidget *widget,
>+                                                        guint      button,
>+                                                        guint32    time);
> 
> // PanelAgent related functions
> static bool       initialize_panel_agent               (const String &config, const String &display, bool resident);
>@@ -1667,7 +1669,7 @@ ui_menu_button_click_cb (GtkButton *butt
>          cur_time.tv_usec < _last_menu_deactivate_time.tv_usec + 200000))
>         return;
> 
>-    action_show_command_menu ();
>+    action_show_command_menu (GTK_WIDGET (button), 1, gtk_get_current_event_time ());
> }
> 
> static gboolean
>@@ -1690,7 +1692,7 @@ ui_factory_button_click_cb (GtkWidget *b
>     if (bevent->button <= 1)
>         _panel_agent->request_factory_menu ();
>     else
>-        action_show_command_menu ();
>+        action_show_command_menu (button, bevent->button, bevent->time);
> 
>     return FALSE;
> }
>@@ -1699,7 +1701,7 @@ static void
> ui_tray_icon_popup_menu_cb (GtkStatusIcon *status_icon, guint button, 
>     guint activate_time, gpointer user_data)
> {
>-    action_show_command_menu ();
>+    action_show_command_menu (status_icon, button, activate_time);
> }
> 
> static void
>@@ -1965,7 +1967,7 @@ ui_toolbar_window_click_cb (GtkWidget *w
> 
>         return TRUE;
>     } else if (click_type == 1 && event->button > 1) {
>-        action_show_command_menu ();
>+        action_show_command_menu (window, event->button, event->time);
>         return TRUE;
>     }
>     return FALSE;
>@@ -2349,15 +2351,15 @@ action_toggle_window_stick (void)
> }
> 
> static void
>-action_show_command_menu (void)
>+action_show_command_menu (GtkWidget *widget,
>+                          guint      button,
>+                          guint32    time)
> {
>     if (_command_menu_activated)
>         return;
> 
>     _command_menu_activated = true;
> 
>-    guint32 activate_time = gtk_get_current_event_time ();
>-
>     if (_command_menu) {
>         gtk_widget_destroy (_command_menu);
>         _command_menu = 0;
>@@ -2460,7 +2462,11 @@ action_show_command_menu (void)
>                       0);
>     gtk_widget_show_all (menu_item);
> 
>-    gtk_menu_popup (GTK_MENU (_command_menu), 0, 0, 0, 0, 2, activate_time);
>+    if (GTK_IS_STATUS_ICON (widget)) {
>+        gtk_menu_popup (GTK_MENU (_command_menu), 0, 0, gtk_status_icon_position_menu, widget, button, time);
>+    } else {
>+        gtk_menu_popup (GTK_MENU (_command_menu), 0, 0, 0, 0, 2, activate_time);
>+    }
> }
> 
> //////////////////////////////////////////////////////////////////////

Actions: View | Diff

Attachments on bug 444711: 312015 | 312020