diff options
Diffstat (limited to 'applets')
| -rw-r--r-- | applets/clock/clock.c | 8 | ||||
| -rw-r--r-- | applets/notification_area/main.c | 6 | ||||
| -rw-r--r-- | applets/wncklet/showdesktop.c | 10 | ||||
| -rw-r--r-- | applets/wncklet/window-menu.c | 4 |
4 files changed, 14 insertions, 14 deletions
diff --git a/applets/clock/clock.c b/applets/clock/clock.c index bc83c651..78c901b0 100644 --- a/applets/clock/clock.c +++ b/applets/clock/clock.c @@ -261,7 +261,7 @@ calculate_minimum_width (GtkWidget *widget, PangoContext *pango_context; PangoLayout *layout; int width, height; -#if !GTK_CHECK_VERSION (3, 19, 0) +#if !GTK_CHECK_VERSION (3, 20, 0) int focus_width = 0; int focus_pad = 0; #endif @@ -284,7 +284,7 @@ calculate_minimum_width (GtkWidget *widget, state = gtk_widget_get_state_flags (widget); style_context = gtk_widget_get_style_context (widget); gtk_style_context_get_padding (style_context, state, &padding); -#if GTK_CHECK_VERSION (3, 19, 0) +#if GTK_CHECK_VERSION (3, 20, 0) width += padding.left + padding.right; #else @@ -1358,7 +1358,7 @@ clock_update_text_gravity (GtkWidget *label) } #if GTK_CHECK_VERSION (3, 0, 0) -#if !GTK_CHECK_VERSION (3, 19, 0) +#if !GTK_CHECK_VERSION (3, 20, 0) static inline void force_no_focus_padding (GtkWidget *widget) { @@ -1412,7 +1412,7 @@ create_main_clock_button (void) button = gtk_toggle_button_new (); gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE); -#if GTK_CHECK_VERSION (3, 19, 0) +#if GTK_CHECK_VERSION (3, 20, 0) gtk_widget_set_name (button, "clock-applet-button"); #else force_no_focus_padding (button); diff --git a/applets/notification_area/main.c b/applets/notification_area/main.c index 4b87e25d..e431a699 100644 --- a/applets/notification_area/main.c +++ b/applets/notification_area/main.c @@ -287,7 +287,7 @@ na_tray_applet_change_orient (MatePanelApplet *panel_applet, } #if GTK_CHECK_VERSION (3, 0, 0) -#if GTK_CHECK_VERSION (3, 19, 0) +#if GTK_CHECK_VERSION (3, 20, 0) /* deprecated with gtk+-3.19.0 */ #else static inline void @@ -363,7 +363,7 @@ na_tray_applet_class_init (NaTrayAppletClass *class) g_type_class_add_private (class, sizeof (NaTrayAppletPrivate)); -#if GTK_CHECK_VERSION (3, 19, 0) +#if GTK_CHECK_VERSION (3, 20, 0) gtk_widget_class_set_css_name (widget_class, "na-tray-applet"); #endif } @@ -390,7 +390,7 @@ na_tray_applet_init (NaTrayApplet *applet) mate_panel_applet_set_background_widget (MATE_PANEL_APPLET (applet), GTK_WIDGET (applet)); #endif -#if GTK_CHECK_VERSION (3, 19, 0) +#if GTK_CHECK_VERSION (3, 20, 0) /* deprecated with gtk+-3.19.0 */ #else force_no_focus_padding (GTK_WIDGET (applet)); diff --git a/applets/wncklet/showdesktop.c b/applets/wncklet/showdesktop.c index f336fd95..a205d9b0 100644 --- a/applets/wncklet/showdesktop.c +++ b/applets/wncklet/showdesktop.c @@ -142,7 +142,7 @@ static void update_icon(ShowDesktopData* sdd) GdkPixbuf* scaled; int icon_size; GError* error; -#if !GTK_CHECK_VERSION (3, 19, 0) +#if !GTK_CHECK_VERSION (3, 20, 0) int focus_width = 0; int focus_pad = 0; #endif @@ -155,7 +155,7 @@ static void update_icon(ShowDesktopData* sdd) state = gtk_widget_get_state_flags (sdd->button); context = gtk_widget_get_style_context (sdd->button); gtk_style_context_get_padding (context, state, &padding); -#if !GTK_CHECK_VERSION (3, 19, 0) +#if !GTK_CHECK_VERSION (3, 20, 0) gtk_style_context_get_style (context, "focus-line-width", &focus_width, "focus-padding", &focus_pad, @@ -170,7 +170,7 @@ static void update_icon(ShowDesktopData* sdd) thickness = padding.left + padding.right; break; } -#if GTK_CHECK_VERSION (3, 19, 0) +#if GTK_CHECK_VERSION (3, 20, 0) icon_size = sdd->size - thickness; #else icon_size = sdd->size - 2 * (focus_width + focus_pad) - thickness; @@ -410,7 +410,7 @@ gboolean show_desktop_applet_fill(MatePanelApplet* applet) gchar* ui_path; AtkObject* atk_obj; #if GTK_CHECK_VERSION (3, 0, 0) -#if !GTK_CHECK_VERSION (3, 19, 0) +#if !GTK_CHECK_VERSION (3, 20, 0) GtkCssProvider *provider; #endif #endif @@ -444,7 +444,7 @@ gboolean show_desktop_applet_fill(MatePanelApplet* applet) gtk_widget_set_name (sdd->button, "showdesktop-button"); #if GTK_CHECK_VERSION (3, 0, 0) -#if !GTK_CHECK_VERSION (3, 19, 0) +#if !GTK_CHECK_VERSION (3, 20, 0) provider = gtk_css_provider_new (); gtk_css_provider_load_from_data (provider, "#showdesktop-button {\n" diff --git a/applets/wncklet/window-menu.c b/applets/wncklet/window-menu.c index c0d7c4c7..7f40caac 100644 --- a/applets/wncklet/window-menu.c +++ b/applets/wncklet/window-menu.c @@ -167,7 +167,7 @@ static gboolean window_menu_on_expose (GtkWidget* widget, #endif #if GTK_CHECK_VERSION (3, 0, 0) -#if !GTK_CHECK_VERSION (3, 19, 0) +#if !GTK_CHECK_VERSION (3, 20, 0) static inline void force_no_focus_padding(GtkWidget* widget) { GtkCssProvider *provider; @@ -300,7 +300,7 @@ gboolean window_menu_applet_fill(MatePanelApplet* applet) window_menu = g_new0(WindowMenu, 1); window_menu->applet = GTK_WIDGET(applet); -#if GTK_CHECK_VERSION (3, 19, 0) +#if GTK_CHECK_VERSION (3, 20, 0) gtk_widget_set_name (window_menu->applet, "window-menu-applet-button"); #else force_no_focus_padding(window_menu->applet); |