[Xfce4-commits] [panel-plugins/xfce4-pulseaudio-plugin] 01/01: Bump requirements to Xfce 4.14 minimum: GTK+ 3.20, GLib 2.42, drop version specific code
noreply at xfce.org
noreply at xfce.org
Mon Aug 28 23:55:58 CEST 2017
This is an automated email from the git hooks/post-receive script.
b l u e s a b r e p u s h e d a c o m m i t t o b r a n c h m a s t e r
in repository panel-plugins/xfce4-pulseaudio-plugin.
commit a0460474a4134f1df821f053775aeeb3ba55847e
Author: Sean Davis <smd.seandavis at gmail.com>
Date: Mon Aug 28 17:55:50 2017 -0400
Bump requirements to Xfce 4.14 minimum: GTK+ 3.20, GLib 2.42, drop version specific code
---
configure.ac.in | 6 +++---
panel-plugin/mprismenuitem.c | 8 ++------
panel-plugin/pulseaudio-button.c | 4 ----
panel-plugin/pulseaudio-dialog.glade | 2 +-
panel-plugin/scalemenuitem.c | 21 ---------------------
5 files changed, 6 insertions(+), 35 deletions(-)
diff --git a/configure.ac.in b/configure.ac.in
index c737c8d..895a5d6 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -76,15 +76,15 @@ AC_DEFINE([LIBXFCE4PANEL_VERSION_API], "libxfce4panel_version_api()", [libxfce4p
AC_SUBST([LIBXFCE4PANEL_VERSION_API])
XDT_CHECK_PACKAGE([PULSEAUDIO], [libpulse-mainloop-glib], [0.9.19])
-XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.24.0])
-XDT_CHECK_PACKAGE([GTK], [gtk+-3.0], [3.6.0])
+XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.42.0])
+XDT_CHECK_PACKAGE([GTK], [gtk+-3.0], [3.20.0])
dnl XDT_CHECK_PACKAGE([EXO], [exo-1], [0.6.0])
XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.9.0])
XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.11.0])
XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-${LIBXFCE4PANEL_VERSION_API}], [4.11.0])
XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.6.0])
-XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.30])
+XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.42])
dnl **********************************
dnl *** Optional keybinder Support ***
diff --git a/panel-plugin/mprismenuitem.c b/panel-plugin/mprismenuitem.c
index 938d8cf..be222ed 100644
--- a/panel-plugin/mprismenuitem.c
+++ b/panel-plugin/mprismenuitem.c
@@ -242,12 +242,8 @@ track_info_label_new (void)
gtk_label_set_max_width_chars (GTK_LABEL (label), 25);
gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_MIDDLE);
- #if GTK_CHECK_VERSION (3, 16, 0)
- gtk_label_set_xalign (GTK_LABEL (label), 0.0);
- gtk_widget_set_halign (label, GTK_ALIGN_START);
- #else
- gtk_misc_set_alignment (GTK_MISC(label), 0, 0);
- #endif
+ gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+ gtk_widget_set_halign (label, GTK_ALIGN_START);
return label;
}
diff --git a/panel-plugin/pulseaudio-button.c b/panel-plugin/pulseaudio-button.c
index 692a651..3e3e1e2 100644
--- a/panel-plugin/pulseaudio-button.c
+++ b/panel-plugin/pulseaudio-button.c
@@ -131,11 +131,7 @@ pulseaudio_button_init (PulseaudioButton *button)
gtk_widget_set_can_default (GTK_WIDGET (button), FALSE);
gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
gtk_button_set_use_underline (GTK_BUTTON (button),TRUE);
-#if GTK_CHECK_VERSION (3, 20, 0)
gtk_widget_set_focus_on_click (GTK_WIDGET (button), FALSE);
-#else
- gtk_button_set_focus_on_click (GTK_BUTTON (button), FALSE);
-#endif
gtk_widget_set_name (GTK_WIDGET (button), "pulseaudio-button");
/* Preload icons */
diff --git a/panel-plugin/pulseaudio-dialog.glade b/panel-plugin/pulseaudio-dialog.glade
index 8adbde0..4c71f29 100644
--- a/panel-plugin/pulseaudio-dialog.glade
+++ b/panel-plugin/pulseaudio-dialog.glade
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.0 -->
<interface>
- <requires lib="gtk+" version="3.6"/>
+ <requires lib="gtk+" version="3.20"/>
<requires lib="libxfce4ui-2" version="4.11"/>
<object class="GtkImage" id="image1">
<property name="visible">True</property>
diff --git a/panel-plugin/scalemenuitem.c b/panel-plugin/scalemenuitem.c
index ee09ca8..9c8d083 100644
--- a/panel-plugin/scalemenuitem.c
+++ b/panel-plugin/scalemenuitem.c
@@ -264,11 +264,6 @@ scale_menu_item_button_press_event (GtkWidget *menuitem,
if (x > 0 && x < alloc.width && y > 0 && y < alloc.height)
{
-#if !(GTK_CHECK_VERSION (3, 14, 0))
- /* event coordinates are supposed to refer to GdkWindow but for some reason in Gtk+-3.12(?) they refer to the widget */
- event->x = (gdouble) x;
- event->y = (gdouble) y;
-#endif
gtk_widget_event (priv->scale, (GdkEvent*) event);
}
@@ -286,9 +281,6 @@ scale_menu_item_button_release_event (GtkWidget *menuitem,
GdkEventButton *event)
{
ScaleMenuItemPrivate *priv;
-#if !(GTK_CHECK_VERSION (3, 14, 0))
- gint x, y;
-#endif
TRACE("entering");
@@ -296,11 +288,6 @@ scale_menu_item_button_release_event (GtkWidget *menuitem,
priv = GET_PRIVATE (menuitem);
-#if !(GTK_CHECK_VERSION (3, 14, 0))
- gtk_widget_translate_coordinates (menuitem, priv->scale, event->x, event->y, &x, &y);
- event->x = (gdouble) x;
- event->y = (gdouble) y;
-#endif
gtk_widget_event (priv->scale, (GdkEvent*)event);
if (priv->grabbed)
@@ -331,10 +318,6 @@ scale_menu_item_motion_notify_event (GtkWidget *menuitem,
if (x > 0 && x < alloc.width && y > 0 && y < alloc.height)
{
-#if !(GTK_CHECK_VERSION (3, 14, 0))
- event->x = (gdouble) x;
- event->y = (gdouble) y;
-#endif
gtk_widget_event (scale, (GdkEvent*) event);
}
@@ -482,12 +465,8 @@ scale_menu_item_label_new (const gchar *str)
GtkWidget *label = gtk_label_new (str);
/* align left */
-#if GTK_CHECK_VERSION (3, 16, 0)
gtk_label_set_xalign (GTK_LABEL (label), 0.0);
gtk_widget_set_halign (label, GTK_ALIGN_START);
-#else
- gtk_misc_set_alignment (GTK_MISC(label), 0, 0);
-#endif
return label;
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list