diff options
| author | Wolfgang Ulbrich <[email protected]> | 2016-02-14 11:22:11 +0100 | 
|---|---|---|
| committer | Wolfgang Ulbrich <[email protected]> | 2016-02-16 23:19:33 +0100 | 
| commit | 0be1bd917ac00a4553bc6d3ace836aed44cd99a4 (patch) | |
| tree | 0354f922c94d4142cab3f3107bf890e8536d7703 /applets | |
| parent | 22516191381198c85e4e480c7603e5827ac17349 (diff) | |
| download | mate-panel-0be1bd917ac00a4553bc6d3ace836aed44cd99a4.tar.bz2 mate-panel-0be1bd917ac00a4553bc6d3ace836aed44cd99a4.tar.xz  | |
GTK+-3.0 workspace-switcher: Remove switching workspace on scroll events
This is now done by WnckPager itself.
And it fixes a build warning.
taken from:
https://git.gnome.org/browse/gnome-panel/commit/?id=8a8c60f
Diffstat (limited to 'applets')
| -rw-r--r-- | applets/wncklet/workspace-switcher.c | 4 | 
1 files changed, 4 insertions, 0 deletions
diff --git a/applets/wncklet/workspace-switcher.c b/applets/wncklet/workspace-switcher.c index b2c62483..07a9cf2d 100644 --- a/applets/wncklet/workspace-switcher.c +++ b/applets/wncklet/workspace-switcher.c @@ -250,6 +250,7 @@ static void applet_change_background(MatePanelApplet* applet, MatePanelAppletBac  #endif  } +#if !GTK_CHECK_VERSION (3, 0, 0)  static gboolean applet_scroll(MatePanelApplet* applet, GdkEventScroll* event, PagerData* pager)  {  	GdkScrollDirection absolute_direction; @@ -353,6 +354,7 @@ static gboolean applet_scroll(MatePanelApplet* applet, GdkEventScroll* event, Pa  	return TRUE;  } +#endif  static void destroy_pager(GtkWidget* widget, PagerData* pager)  { @@ -577,7 +579,9 @@ gboolean workspace_switcher_applet_fill(MatePanelApplet* applet)  	g_signal_connect(G_OBJECT(pager->applet), "realize", G_CALLBACK(applet_realized), pager);  	g_signal_connect(G_OBJECT(pager->applet), "unrealize", G_CALLBACK(applet_unrealized), pager);  	g_signal_connect(G_OBJECT(pager->applet), "change_orient", G_CALLBACK(applet_change_orient), pager); +#if !GTK_CHECK_VERSION (3, 0, 0)  	g_signal_connect(G_OBJECT(pager->applet), "scroll-event", G_CALLBACK(applet_scroll), pager); +#endif  	g_signal_connect(G_OBJECT(pager->applet), "change_background", G_CALLBACK(applet_change_background), pager);  	gtk_widget_show(pager->applet);  | 
