summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormonsta <[email protected]>2016-11-21 18:41:01 +0300
committermonsta <[email protected]>2016-11-21 18:41:01 +0300
commitcd7c4c546fa230e78608c206502e9758eef22c54 (patch)
tree4a90c42bd82d79fc0827462711553f50e570c28e
parent9e5c593552795c283aec5fc61478794e6b2b4ae7 (diff)
downloadmate-panel-cd7c4c546fa230e78608c206502e9758eef22c54.tar.bz2
mate-panel-cd7c4c546fa230e78608c206502e9758eef22c54.tar.xz
check for stable release of GTK+3, not for development one
Diffstat
-rw-r--r--applets/clock/clock.c8
-rw-r--r--applets/notification_area/main.c6
-rw-r--r--applets/wncklet/showdesktop.c10
-rw-r--r--applets/wncklet/window-menu.c4
-rw-r--r--libmate-panel-applet/mate-panel-applet.c2
-rw-r--r--libmate-panel-applet/panel-plug.c2
-rw-r--r--mate-panel/button-widget.c6
-rw-r--r--mate-panel/libmate-panel-applet-private/panel-applet-frame-dbus.c2
-rw-r--r--mate-panel/panel-frame.c2
-rw-r--r--mate-panel/panel-separator.c2
-rw-r--r--mate-panel/panel-toplevel.c8
-rw-r--r--mate-panel/panel-widget.c2
12 files changed, 27 insertions, 27 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);
diff --git a/libmate-panel-applet/mate-panel-applet.c b/libmate-panel-applet/mate-panel-applet.c
index a3d6774d..a619c9e9 100644
--- a/libmate-panel-applet/mate-panel-applet.c
+++ b/libmate-panel-applet/mate-panel-applet.c
@@ -2356,7 +2356,7 @@ mate_panel_applet_class_init (MatePanelAppletClass *klass)
add_tab_bindings (binding_set, GDK_CONTROL_MASK, GTK_DIR_TAB_FORWARD);
add_tab_bindings (binding_set, GDK_CONTROL_MASK | GDK_SHIFT_MASK, GTK_DIR_TAB_BACKWARD);
-#if GTK_CHECK_VERSION (3, 19, 0)
+#if GTK_CHECK_VERSION (3, 20, 0)
gtk_widget_class_set_css_name (widget_class, "PanelApplet");
#endif
}
diff --git a/libmate-panel-applet/panel-plug.c b/libmate-panel-applet/panel-plug.c
index 836285f3..7360ddac 100644
--- a/libmate-panel-applet/panel-plug.c
+++ b/libmate-panel-applet/panel-plug.c
@@ -84,7 +84,7 @@ panel_plug_class_init (PanelPlugClass *plug_class)
widget_class->draw = panel_plug_draw;
widget_class->realize = panel_plug_realize;
-#if GTK_CHECK_VERSION (3, 19, 0)
+#if GTK_CHECK_VERSION (3, 20, 0)
gtk_widget_class_set_css_name (widget_class, "PanelApplet");
#endif
}
diff --git a/mate-panel/button-widget.c b/mate-panel/button-widget.c
index 3e6c34c5..a04fac6a 100644
--- a/mate-panel/button-widget.c
+++ b/mate-panel/button-widget.c
@@ -564,14 +564,14 @@ button_widget_expose (GtkWidget *widget,
}
if (gtk_widget_has_focus (widget)) {
-#if !GTK_CHECK_VERSION (3, 19, 0)
+#if !GTK_CHECK_VERSION (3, 20, 0)
gint focus_pad;
#endif
gtk_style_context_save (context);
gtk_style_context_set_state (context, state_flags);
-#if !GTK_CHECK_VERSION (3, 19, 0)
+#if !GTK_CHECK_VERSION (3, 20, 0)
gtk_widget_style_get (widget,
"focus-padding", &focus_pad,
NULL);
@@ -582,7 +582,7 @@ button_widget_expose (GtkWidget *widget,
#endif
cairo_save (cr);
-#if GTK_CHECK_VERSION (3, 19, 0)
+#if GTK_CHECK_VERSION (3, 20, 0)
gtk_render_focus (context, cr, 0, 0, width, height);
#else
gtk_render_focus (context, cr, x, y, w, h);
diff --git a/mate-panel/libmate-panel-applet-private/panel-applet-frame-dbus.c b/mate-panel/libmate-panel-applet-private/panel-applet-frame-dbus.c
index 463c9994..9a3464ce 100644
--- a/mate-panel/libmate-panel-applet-private/panel-applet-frame-dbus.c
+++ b/mate-panel/libmate-panel-applet-private/panel-applet-frame-dbus.c
@@ -385,7 +385,7 @@ mate_panel_applet_frame_dbus_class_init (MatePanelAppletFrameDBusClass *class)
frame_class->change_size = mate_panel_applet_frame_dbus_change_size;
frame_class->change_background = mate_panel_applet_frame_dbus_change_background;
-#if GTK_CHECK_VERSION (3, 19, 0)
+#if GTK_CHECK_VERSION (3, 20, 0)
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
gtk_widget_class_set_css_name (widget_class, "MatePanelAppletFrameDBus");
#endif
diff --git a/mate-panel/panel-frame.c b/mate-panel/panel-frame.c
index 36125917..b0529f1d 100644
--- a/mate-panel/panel-frame.c
+++ b/mate-panel/panel-frame.c
@@ -500,7 +500,7 @@ panel_frame_class_init (PanelFrameClass *klass)
widget_class->size_request = panel_frame_size_request;
widget_class->expose_event = panel_frame_expose;
#endif
-#if GTK_CHECK_VERSION (3, 19, 0)
+#if GTK_CHECK_VERSION (3, 20, 0)
gtk_widget_class_set_css_name (widget_class, "PanelFrame");
#endif
diff --git a/mate-panel/panel-separator.c b/mate-panel/panel-separator.c
index 93b58293..33a56768 100644
--- a/mate-panel/panel-separator.c
+++ b/mate-panel/panel-separator.c
@@ -263,7 +263,7 @@ panel_separator_class_init (PanelSeparatorClass *klass)
widget_class->size_allocate = panel_separator_size_allocate;
widget_class->parent_set = panel_separator_parent_set;
-#if GTK_CHECK_VERSION (3, 19, 0)
+#if GTK_CHECK_VERSION (3, 20, 0)
gtk_widget_class_set_css_name (widget_class, "PanelSeparator");
#endif
diff --git a/mate-panel/panel-toplevel.c b/mate-panel/panel-toplevel.c
index d5263ba6..b3a886a6 100644
--- a/mate-panel/panel-toplevel.c
+++ b/mate-panel/panel-toplevel.c
@@ -2439,7 +2439,7 @@ calculate_minimum_height (GtkWidget *widget,
#endif
PangoContext *pango_context;
PangoFontMetrics *metrics;
-#if !GTK_CHECK_VERSION (3, 19, 0)
+#if !GTK_CHECK_VERSION (3, 20, 0)
int focus_width = 0;
int focus_pad = 0;
#endif
@@ -2470,7 +2470,7 @@ calculate_minimum_height (GtkWidget *widget,
pango_font_metrics_unref (metrics);
-#if !GTK_CHECK_VERSION (3, 19, 0)
+#if !GTK_CHECK_VERSION (3, 20, 0)
gtk_widget_style_get (widget,
"focus-line-width", &focus_width,
"focus-padding", &focus_pad,
@@ -2482,7 +2482,7 @@ calculate_minimum_height (GtkWidget *widget,
padding.top + padding.bottom :
padding.left + padding.right;
-#if GTK_CHECK_VERSION (3, 19, 0)
+#if GTK_CHECK_VERSION (3, 20, 0)
return PANGO_PIXELS (ascent + descent) + thickness;
#else
return PANGO_PIXELS (ascent + descent) + 2 * (focus_width + focus_pad) + thickness;
@@ -4697,7 +4697,7 @@ panel_toplevel_class_init (PanelToplevelClass *klass)
widget_class->focus_in_event = panel_toplevel_focus_in_event;
widget_class->focus_out_event = panel_toplevel_focus_out_event;
-#if GTK_CHECK_VERSION (3, 19, 0)
+#if GTK_CHECK_VERSION (3, 20, 0)
gtk_widget_class_set_css_name (widget_class, "PanelToplevel");
#endif
diff --git a/mate-panel/panel-widget.c b/mate-panel/panel-widget.c
index 39789cb3..d41ceefe 100644
--- a/mate-panel/panel-widget.c
+++ b/mate-panel/panel-widget.c
@@ -448,7 +448,7 @@ panel_widget_class_init (PanelWidgetClass *class)
widget_class->size_request = panel_widget_size_request;
#endif
widget_class->size_allocate = panel_widget_size_allocate;
-#if GTK_CHECK_VERSION (3, 19, 0)
+#if GTK_CHECK_VERSION (3, 20, 0)
gtk_widget_class_set_css_name (widget_class, "PanelWidget");
#endif
#if GTK_CHECK_VERSION (3, 18, 0)
generated by cgit v1.2.1 (git 2.18.0) at 2024-04-25 10:01:38 +0000