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/panel.c | |
| 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/panel.c')
| -rw-r--r-- | mate-panel/panel.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/mate-panel/panel.c b/mate-panel/panel.c index 206b6c82..f3bf417b 100644 --- a/mate-panel/panel.c +++ b/mate-panel/panel.c @@ -19,9 +19,7 @@ #include <gio/gio.h> #include <gtk/gtk.h> #include <gdk/gdkkeysyms.h> -#if GTK_CHECK_VERSION (3, 0, 0) #include <gtk/gtkx.h> /* for GTK_IS_SOCKET */ -#endif #include <libpanel-util/panel-glib.h> @@ -404,11 +402,7 @@ panel_key_press_event (GtkWidget *widget, if (GTK_IS_SOCKET (gtk_window_get_focus (GTK_WINDOW (widget))) && event->keyval == GDK_KEY_F10 && (event->state & gtk_accelerator_get_default_mod_mask ()) == GDK_CONTROL_MASK) -#if GTK_CHECK_VERSION (3, 0, 0) return gtk_bindings_activate (G_OBJECT (widget), -#else - return gtk_bindings_activate (GTK_OBJECT (widget), -#endif event->keyval, event->state); @@ -440,11 +434,7 @@ static gboolean set_background_color (PanelToplevel *toplevel, guint16 *dropped) { -#if GTK_CHECK_VERSION (3, 0, 0) GdkRGBA color; -#else - PanelColor color; -#endif if (!dropped) return FALSE; @@ -453,17 +443,10 @@ set_background_color (PanelToplevel *toplevel, ! panel_profile_background_key_is_writable (toplevel, "type")) return FALSE; -#if GTK_CHECK_VERSION (3, 0, 0) color.red = dropped [0]; color.green = dropped [1]; color.blue = dropped [2]; color.alpha = 1.; -#else - color.gdk.red = dropped [0]; - color.gdk.green = dropped [1]; - color.gdk.blue = dropped [2]; - color.alpha = 65535; -#endif panel_profile_set_background_color (toplevel, &color); panel_profile_set_background_type (toplevel, PANEL_BACK_COLOR); |