diff options
author | monsta <[email protected]> | 2016-11-21 21:14:26 +0300 |
---|---|---|
committer | monsta <[email protected]> | 2016-11-21 21:14:26 +0300 |
commit | d0ddaedffa7d417a699cafce73c1e418515c4a28 (patch) | |
tree | 645b7a86e32b21113e1ce14f563bfb8d8900fa53 /mate-panel/libpanel-util | |
parent | 7dfeb78328039cf92a9f45d64c9b3662d967a1fe (diff) | |
download | mate-panel-d0ddaedffa7d417a699cafce73c1e418515c4a28.tar.bz2 mate-panel-d0ddaedffa7d417a699cafce73c1e418515c4a28.tar.xz |
move to GTK+3 (>= 3.14), drop GTK+2 code and --with-gtk build option
and require libmate-desktop >= 1.17
WARNING: use GTK+3 build of libmateweather for this build.
that lib is not migrated to GTK+3 only as we will possibly
use libgweather instead of it.
Diffstat (limited to 'mate-panel/libpanel-util')
-rw-r--r-- | mate-panel/libpanel-util/panel-color.c | 5 | ||||
-rw-r--r-- | mate-panel/libpanel-util/panel-color.h | 4 | ||||
-rw-r--r-- | mate-panel/libpanel-util/panel-icon-chooser.c | 4 | ||||
-rw-r--r-- | mate-panel/libpanel-util/panel-launch.c | 4 | ||||
-rw-r--r-- | mate-panel/libpanel-util/panel-show.h | 2 | ||||
-rw-r--r-- | mate-panel/libpanel-util/panel-xdg.c | 1 | ||||
-rw-r--r-- | mate-panel/libpanel-util/panel-xdg.h | 2 |
7 files changed, 4 insertions, 18 deletions
diff --git a/mate-panel/libpanel-util/panel-color.c b/mate-panel/libpanel-util/panel-color.c index 9ac198a8..864d68d8 100644 --- a/mate-panel/libpanel-util/panel-color.c +++ b/mate-panel/libpanel-util/panel-color.c @@ -1,6 +1,5 @@ #include "panel-color.h" -#if GTK_CHECK_VERSION (3, 0, 0) /** * rgb_to_hls: * @r: on input, red; on output, hue @@ -197,7 +196,3 @@ gtk_style_shade (GdkRGBA *a, GdkRGBA *b, gdouble k) b->green = green; b->blue = blue; } -#else - -#endif - diff --git a/mate-panel/libpanel-util/panel-color.h b/mate-panel/libpanel-util/panel-color.h index 753c28ff..327235db 100644 --- a/mate-panel/libpanel-util/panel-color.h +++ b/mate-panel/libpanel-util/panel-color.h @@ -1,13 +1,11 @@ #ifndef PANEL_COLOR_H #define PANEL_COLOR_H -#include <gtk/gtk.h> +#include <gdk/gdk.h> G_BEGIN_DECLS -#if GTK_CHECK_VERSION (3, 0, 0) void gtk_style_shade (GdkRGBA *a, GdkRGBA *b, gdouble k); -#endif G_END_DECLS diff --git a/mate-panel/libpanel-util/panel-icon-chooser.c b/mate-panel/libpanel-util/panel-icon-chooser.c index 91cbdc59..98dcef8e 100644 --- a/mate-panel/libpanel-util/panel-icon-chooser.c +++ b/mate-panel/libpanel-util/panel-icon-chooser.c @@ -421,11 +421,7 @@ _panel_icon_chooser_clicked (GtkButton *button) if (info) { path = g_strdup (gtk_icon_info_get_filename (info)); -#if GTK_CHECK_VERSION (3, 8, 0) g_object_unref (info); -#else - gtk_icon_info_free (info); -#endif } } diff --git a/mate-panel/libpanel-util/panel-launch.c b/mate-panel/libpanel-util/panel-launch.c index 66502b6d..59ca900a 100644 --- a/mate-panel/libpanel-util/panel-launch.c +++ b/mate-panel/libpanel-util/panel-launch.c @@ -109,12 +109,8 @@ panel_app_info_launch_uris (GAppInfo *appinfo, g_return_val_if_fail (GDK_IS_SCREEN (screen), FALSE); g_return_val_if_fail (error == NULL || *error == NULL, FALSE); -#if GTK_CHECK_VERSION(3, 0, 0) GdkDisplay *display = gdk_display_get_default (); context = gdk_display_get_app_launch_context (display); -#else - context = gdk_app_launch_context_new (); -#endif gdk_app_launch_context_set_screen (context, screen); gdk_app_launch_context_set_timestamp (context, timestamp); diff --git a/mate-panel/libpanel-util/panel-show.h b/mate-panel/libpanel-util/panel-show.h index 60969c06..ec3e9baa 100644 --- a/mate-panel/libpanel-util/panel-show.h +++ b/mate-panel/libpanel-util/panel-show.h @@ -25,7 +25,7 @@ #ifndef PANEL_SHOW_H #define PANEL_SHOW_H -#include <gtk/gtk.h> +#include <gdk/gdk.h> #ifdef __cplusplus extern "C" { diff --git a/mate-panel/libpanel-util/panel-xdg.c b/mate-panel/libpanel-util/panel-xdg.c index 501a783c..bcdbb5fa 100644 --- a/mate-panel/libpanel-util/panel-xdg.c +++ b/mate-panel/libpanel-util/panel-xdg.c @@ -26,6 +26,7 @@ #include <glib.h> #include <gio/gio.h> +#include <gtk/gtk.h> #include "panel-xdg.h" diff --git a/mate-panel/libpanel-util/panel-xdg.h b/mate-panel/libpanel-util/panel-xdg.h index 91aa2185..359c91b2 100644 --- a/mate-panel/libpanel-util/panel-xdg.h +++ b/mate-panel/libpanel-util/panel-xdg.h @@ -25,7 +25,7 @@ #ifndef PANEL_XDG_H #define PANEL_XDG_H -#include <gtk/gtk.h> +#include <gdk/gdk.h> #ifdef __cplusplus extern "C" { |