diff options
| author | monsta <[email protected]> | 2016-01-04 20:27:23 +0300 |
|---|---|---|
| committer | monsta <[email protected]> | 2016-01-04 20:27:23 +0300 |
| commit | 98576d25e966aded1c3f67c41c146e15e4827ced (patch) | |
| tree | 5cb99b0e71fcb560f70711676629dc14cd653c0e | |
| parent | 49326e0842e21504170957b07debde3bd2906b0c (diff) | |
| download | mate-panel-98576d25e966aded1c3f67c41c146e15e4827ced.tar.bz2 mate-panel-98576d25e966aded1c3f67c41c146e15e4827ced.tar.xz | |
background: normalize usage of GTK_CHECK_VERSION
| -rw-r--r-- | mate-panel/panel-background.c | 3 | ||||
| -rw-r--r-- | mate-panel/panel-background.h | 7 |
2 files changed, 3 insertions, 7 deletions
diff --git a/mate-panel/panel-background.c b/mate-panel/panel-background.c index 628ae244..4a899f4a 100644 --- a/mate-panel/panel-background.c +++ b/mate-panel/panel-background.c @@ -154,8 +154,6 @@ panel_background_prepare (PanelBackground *background) effective_type = panel_background_effective_type (background); - - switch (effective_type) { case PANEL_BACK_NONE: #if GTK_CHECK_VERSION (3, 0, 0) @@ -230,7 +228,6 @@ panel_background_prepare (PanelBackground *background) * make sure that all drawing has been completed before * the applet looks at the pixmap. */ #if GTK_CHECK_VERSION (3, 0, 0) - gdk_display_sync (gdk_window_get_display (background->window)); #else gdk_display_sync (gdk_drawable_get_display (background->window)); diff --git a/mate-panel/panel-background.h b/mate-panel/panel-background.h index 02b3605f..eabcdc3e 100644 --- a/mate-panel/panel-background.h +++ b/mate-panel/panel-background.h @@ -157,12 +157,11 @@ const GdkPixmap *panel_background_get_pixmap (PanelBackground *background); PanelBackgroundType panel_background_effective_type (PanelBackground *background); -#if !GTK_CHECK_VERSION (3, 0, 0) +#if GTK_CHECK_VERSION (3, 0, 0) +void panel_background_apply_css(GtkWidget* widget, PanelBackground *background); +#else void panel_background_change_background_on_widget (PanelBackground *background, GtkWidget *widget); - -#else -void panel_background_apply_css(GtkWidget* widget, PanelBackground *background); #endif #endif /* __PANEL_BACKGROUND_H__ */ |