r27628 - /desktop/experimental/gnome-panel/debian/patches/04_modifier_contextmenu.patch
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Sat Apr 16 20:19:17 UTC 2011
Author: joss
Date: Sat Apr 16 20:19:11 2011
New Revision: 27628
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=27628
Log:
Refresh the patch against 3.0.0.1
Modified:
desktop/experimental/gnome-panel/debian/patches/04_modifier_contextmenu.patch
Modified: desktop/experimental/gnome-panel/debian/patches/04_modifier_contextmenu.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/patches/04_modifier_contextmenu.patch?rev=27628&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/patches/04_modifier_contextmenu.patch [utf-8] (original)
+++ desktop/experimental/gnome-panel/debian/patches/04_modifier_contextmenu.patch [utf-8] Sat Apr 16 20:19:11 2011
@@ -1,8 +1,8 @@
-Index: gnome-panel-2.91.93/gnome-panel/panel.c
-===================================================================
---- gnome-panel-2.91.93.orig/gnome-panel/panel.c 2011-04-02 19:41:16.901302001 +0200
-+++ gnome-panel-2.91.93/gnome-panel/panel.c 2011-04-02 20:40:24.101302361 +0200
-@@ -355,14 +355,14 @@ static gboolean
+Index: gnome-panel-3.0.0.1/gnome-panel/panel.c
+===================================================================
+--- gnome-panel-3.0.0.1.orig/gnome-panel/panel.c 2011-04-01 12:39:58.000000000 +0200
++++ gnome-panel-3.0.0.1/gnome-panel/panel.c 2011-04-16 22:17:56.615245052 +0200
+@@ -358,14 +358,14 @@ static gboolean
panel_button_press_event (PanelToplevel *toplevel,
GdkEventButton *event)
{
@@ -20,11 +20,11 @@
return panel_popup_menu (toplevel, event->button, event->time);
return FALSE;
-Index: gnome-panel-2.91.93/gnome-panel/applet.c
-===================================================================
---- gnome-panel-2.91.93.orig/gnome-panel/applet.c 2011-04-02 20:44:50.565302001 +0200
-+++ gnome-panel-2.91.93/gnome-panel/applet.c 2011-04-02 20:46:17.797302001 +0200
-@@ -676,7 +676,7 @@ applet_button_press (GtkWidget *wid
+Index: gnome-panel-3.0.0.1/gnome-panel/applet.c
+===================================================================
+--- gnome-panel-3.0.0.1.orig/gnome-panel/applet.c 2011-04-01 12:39:58.000000000 +0200
++++ gnome-panel-3.0.0.1/gnome-panel/applet.c 2011-04-16 22:17:56.615245052 +0200
+@@ -677,7 +677,7 @@ applet_button_press (GtkWidget *wid
GdkEventButton *event,
AppletInfo *info)
{
@@ -33,7 +33,7 @@
if (event->button != 3)
return FALSE;
-@@ -684,9 +684,9 @@ applet_button_press (GtkWidget *wid
+@@ -685,9 +685,9 @@ applet_button_press (GtkWidget *wid
if (applet_must_skip_menu (info))
return FALSE;
@@ -45,10 +45,10 @@
applet_show_menu (info, panel_applet_get_edit_menu (info), FALSE, event);
else
applet_show_menu (info, panel_applet_get_menu (info), TRUE, event);
-Index: gnome-panel-2.91.93/gnome-panel/panel-applet-frame.c
-===================================================================
---- gnome-panel-2.91.93.orig/gnome-panel/panel-applet-frame.c 2011-04-02 20:40:38.817302001 +0200
-+++ gnome-panel-2.91.93/gnome-panel/panel-applet-frame.c 2011-04-02 20:44:33.593302001 +0200
+Index: gnome-panel-3.0.0.1/gnome-panel/panel-applet-frame.c
+===================================================================
+--- gnome-panel-3.0.0.1.orig/gnome-panel/panel-applet-frame.c 2011-04-01 12:39:58.000000000 +0200
++++ gnome-panel-3.0.0.1/gnome-panel/panel-applet-frame.c 2011-04-16 22:17:56.615245052 +0200
@@ -347,7 +347,7 @@ panel_applet_frame_button_changed (GtkWi
{
PanelAppletFrame *frame;
@@ -75,7 +75,7 @@
+ (event->state & keymask) == keymask) {
panel_widget_applet_drag_start (
frame->priv->panel, GTK_WIDGET (frame),
- PW_DRAG_OFF_CURSOR, event->time);
+ event->time);
@@ -387,7 +387,7 @@ panel_applet_frame_button_changed (GtkWi
pointer = gdk_device_manager_get_client_pointer (device_manager);
gdk_device_ungrab (pointer, GDK_CURRENT_TIME);
@@ -85,11 +85,11 @@
PANEL_APPLET_FRAME_GET_CLASS (frame)->popup_edit_menu (frame,
event->button,
event->time);
-Index: gnome-panel-2.91.93/gnome-panel/panel-toplevel.c
-===================================================================
---- gnome-panel-2.91.93.orig/gnome-panel/panel-toplevel.c 2011-04-02 20:46:38.125302002 +0200
-+++ gnome-panel-2.91.93/gnome-panel/panel-toplevel.c 2011-04-02 20:50:30.729301725 +0200
-@@ -2930,6 +2930,7 @@ panel_toplevel_button_press_event (GtkWi
+Index: gnome-panel-3.0.0.1/gnome-panel/panel-toplevel.c
+===================================================================
+--- gnome-panel-3.0.0.1.orig/gnome-panel/panel-toplevel.c 2011-04-01 12:39:58.000000000 +0200
++++ gnome-panel-3.0.0.1/gnome-panel/panel-toplevel.c 2011-04-16 22:17:56.619245077 +0200
+@@ -2943,6 +2943,7 @@ panel_toplevel_button_press_event (GtkWi
{
PanelToplevel *toplevel;
GtkWidget *event_widget;
@@ -97,7 +97,7 @@
g_return_val_if_fail (PANEL_IS_TOPLEVEL (widget), FALSE);
-@@ -2944,8 +2945,9 @@ panel_toplevel_button_press_event (GtkWi
+@@ -2957,8 +2958,9 @@ panel_toplevel_button_press_event (GtkWi
/* Get the mouse-button modifier from metacity so that only intentional
* moves are considered. We don't this for non-expanded panels since we
* only have the handles that the user can grab. */
@@ -108,10 +108,10 @@
return FALSE;
gdk_window_get_user_data (event->window, (gpointer)&event_widget);
-Index: gnome-panel-2.91.93/gnome-panel/panel-util.c
-===================================================================
---- gnome-panel-2.91.93.orig/gnome-panel/panel-util.c 2011-04-02 20:54:33.181302001 +0200
-+++ gnome-panel-2.91.93/gnome-panel/panel-util.c 2011-04-02 21:07:54.321300280 +0200
+Index: gnome-panel-3.0.0.1/gnome-panel/panel-util.c
+===================================================================
+--- gnome-panel-3.0.0.1.orig/gnome-panel/panel-util.c 2011-04-01 12:39:58.000000000 +0200
++++ gnome-panel-3.0.0.1/gnome-panel/panel-util.c 2011-04-16 22:17:56.619245077 +0200
@@ -1119,6 +1119,7 @@ panel_util_key_event_is_binding (GdkEven
gboolean popup_modifier = FALSE;
char *signal_dash;
@@ -131,11 +131,11 @@
break;
}
}
-Index: gnome-panel-2.91.93/gnome-panel/panel-widget.c
-===================================================================
---- gnome-panel-2.91.93.orig/gnome-panel/panel-widget.c 2011-04-02 20:50:39.777302001 +0200
-+++ gnome-panel-2.91.93/gnome-panel/panel-widget.c 2011-04-02 20:52:55.749300283 +0200
-@@ -1956,7 +1956,7 @@ panel_widget_applet_button_press_event (
+Index: gnome-panel-3.0.0.1/gnome-panel/panel-widget.c
+===================================================================
+--- gnome-panel-3.0.0.1.orig/gnome-panel/panel-widget.c 2011-04-01 12:39:58.000000000 +0200
++++ gnome-panel-3.0.0.1/gnome-panel/panel-widget.c 2011-04-16 22:17:56.623245091 +0200
+@@ -2120,7 +2120,7 @@ panel_widget_applet_button_press_event (
{
GtkWidget *parent;
PanelWidget *panel;
@@ -144,7 +144,7 @@
guint32 event_time;
parent = gtk_widget_get_parent (widget);
-@@ -1974,14 +1974,14 @@ panel_widget_applet_button_press_event (
+@@ -2138,14 +2138,14 @@ panel_widget_applet_button_press_event (
return TRUE;
}
@@ -161,10 +161,10 @@
gtk_grab_get_current() != NULL)
return FALSE;
-Index: gnome-panel-2.91.93/libpanel-applet/panel-applet-bindings.c
-===================================================================
---- gnome-panel-2.91.93.orig/libpanel-applet/panel-applet-bindings.c 2011-04-02 21:23:28.241302002 +0200
-+++ gnome-panel-2.91.93/libpanel-applet/panel-applet-bindings.c 2011-04-02 21:26:51.809301892 +0200
+Index: gnome-panel-3.0.0.1/libpanel-applet/panel-applet-bindings.c
+===================================================================
+--- gnome-panel-3.0.0.1.orig/libpanel-applet/panel-applet-bindings.c 2011-02-22 23:18:58.000000000 +0100
++++ gnome-panel-3.0.0.1/libpanel-applet/panel-applet-bindings.c 2011-04-16 22:17:56.623245091 +0200
@@ -260,6 +260,7 @@ panel_applet_bindings_key_event_is_bindi
gboolean popup_modifier = FALSE;
char *signal_dash;
@@ -182,10 +182,10 @@
break;
}
}
-Index: gnome-panel-2.91.93/libpanel-applet/panel-applet.c
-===================================================================
---- gnome-panel-2.91.93.orig/libpanel-applet/panel-applet.c 2011-04-02 21:27:22.369302001 +0200
-+++ gnome-panel-2.91.93/libpanel-applet/panel-applet.c 2011-04-02 21:28:33.085302001 +0200
+Index: gnome-panel-3.0.0.1/libpanel-applet/panel-applet.c
+===================================================================
+--- gnome-panel-3.0.0.1.orig/libpanel-applet/panel-applet.c 2011-03-28 23:08:42.000000000 +0200
++++ gnome-panel-3.0.0.1/libpanel-applet/panel-applet.c 2011-04-16 22:17:56.623245091 +0200
@@ -1264,11 +1264,11 @@ panel_applet_button_press (GtkWidget
}
More information about the pkg-gnome-commits
mailing list