diff options
author | Stefano Karapetsas <[email protected]> | 2014-01-16 10:02:43 +0100 |
---|---|---|
committer | Stefano Karapetsas <[email protected]> | 2014-01-16 10:02:43 +0100 |
commit | 73b9047c8d221558fa3bd3ed0f6a17d76fe84910 (patch) | |
tree | 9c7811c4e10e2438f81b89afaea86223c5984256 /mate-window-picker-applet/applet.c | |
parent | 250aa6b573bc495efe96dad816267daf65182a3c (diff) | |
download | mate-netbook-73b9047c8d221558fa3bd3ed0f6a17d76fe84910.tar.bz2 mate-netbook-73b9047c8d221558fa3bd3ed0f6a17d76fe84910.tar.xz |
mate-window-picker-applet: Add GTK3 support
Diffstat (limited to 'mate-window-picker-applet/applet.c')
-rw-r--r-- | mate-window-picker-applet/applet.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/mate-window-picker-applet/applet.c b/mate-window-picker-applet/applet.c index be98536..2edd45e 100644 --- a/mate-window-picker-applet/applet.c +++ b/mate-window-picker-applet/applet.c @@ -35,6 +35,10 @@ #include <mate-panel-applet.h> #include <mate-panel-applet-gsettings.h> +#if GTK_CHECK_VERSION (3, 0, 0) +#define gtk_rc_style_unref g_object_ref +#endif + #include "task-list.h" #include "task-title.h" @@ -60,7 +64,11 @@ static gpointer parent_class; static void cw_panel_background_changed (MatePanelApplet *applet, MatePanelAppletBackgroundType type, GdkColor *colour, +#if GTK_CHECK_VERSION (3, 0, 0) + cairo_pattern_t *pattern, +#else GdkPixmap *pixmap, +#endif gpointer user_data); static void display_about_dialog (GtkAction *action, WinPickerApp *applet); @@ -229,7 +237,11 @@ static void cw_panel_background_changed (MatePanelApplet *applet, MatePanelAppletBackgroundType type, GdkColor *colour, +#if GTK_CHECK_VERSION (3, 0, 0) + cairo_pattern_t *pattern, +#else GdkPixmap *pixmap, +#endif gpointer user_data) { GtkRcStyle *rc_style; @@ -256,12 +268,16 @@ cw_panel_background_changed (MatePanelApplet *applet, break; case PANEL_PIXMAP_BACKGROUND: +#if GTK_CHECK_VERSION (3, 0, 0) + /* FIXME */ +#else style = gtk_style_copy (GTK_WIDGET (applet)->style); if (style->bg_pixmap[GTK_STATE_NORMAL]) g_object_unref (style->bg_pixmap[GTK_STATE_NORMAL]); style->bg_pixmap[GTK_STATE_NORMAL] = g_object_ref (pixmap); gtk_widget_set_style (GTK_WIDGET (applet), style); g_object_unref (style); +#endif /*style = gtk_style_copy (mainapp->title->style); if (style->bg_pixmap[GTK_STATE_NORMAL]) |