[Xfce4-commits] [apps/parole] 01/01: Bump minimum GTK version to 3.20, minimum stable version for GtkShortcutsWindow
noreply at xfce.org
noreply at xfce.org
Thu Jun 1 04:20:51 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 apps/parole.
commit c025d15d98799cc535bcff388b7d718f65b7e35b
Author: Sean Davis <smd.seandavis at gmail.com>
Date: Wed May 31 22:20:43 2017 -0400
Bump minimum GTK version to 3.20, minimum stable version for GtkShortcutsWindow
---
configure.ac.in | 2 +-
data/interfaces/mediachooser.ui | 2 +-
data/interfaces/open-location.ui | 2 +-
data/interfaces/parole-settings.ui | 2 +-
data/interfaces/parole.ui | 2 +-
data/interfaces/playlist.ui | 2 +-
data/interfaces/plugins.ui | 2 +-
data/interfaces/save-playlist.ui | 2 +-
data/interfaces/shortcuts.ui | 3 +--
src/parole-medialist.c | 6 ------
src/parole-player.c | 27 ---------------------------
11 files changed, 9 insertions(+), 43 deletions(-)
diff --git a/configure.ac.in b/configure.ac.in
index 503c19a..9407657 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -88,7 +88,7 @@ XDT_I18N([@LINGUAS@])
# ===================================================== #
# Check for required packages #
# ===================================================== #
-m4_define([gtk_minimum_version], [3.14.0])
+m4_define([gtk_minimum_version], [3.20.0])
m4_define([glib_minimum_version], [2.32.0])
m4_define([clutter_minimum_version], [1.16.4])
m4_define([cluttergtk_minimum_version], [1.4.4])
diff --git a/data/interfaces/mediachooser.ui b/data/interfaces/mediachooser.ui
index 29f8baf..831afa0 100644
--- a/data/interfaces/mediachooser.ui
+++ b/data/interfaces/mediachooser.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.0 -->
<interface>
- <requires lib="gtk+" version="3.14"/>
+ <requires lib="gtk+" version="3.20"/>
<object class="GtkDialog" id="chooser">
<property name="can_focus">False</property>
<property name="border_width">0</property>
diff --git a/data/interfaces/open-location.ui b/data/interfaces/open-location.ui
index 2f83e1d..240e551 100644
--- a/data/interfaces/open-location.ui
+++ b/data/interfaces/open-location.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.0 -->
<interface>
- <requires lib="gtk+" version="3.14"/>
+ <requires lib="gtk+" version="3.20"/>
<object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="can_focus">False</property>
diff --git a/data/interfaces/parole-settings.ui b/data/interfaces/parole-settings.ui
index 168e929..fe69d72 100644
--- a/data/interfaces/parole-settings.ui
+++ b/data/interfaces/parole-settings.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.0 -->
<interface>
- <requires lib="gtk+" version="3.14"/>
+ <requires lib="gtk+" version="3.20"/>
<requires lib="libxfce4ui-2" version="4.11"/>
<object class="GtkImage" id="image2">
<property name="visible">True</property>
diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui
index 0cc0e7b..091bf57 100644
--- a/data/interfaces/parole.ui
+++ b/data/interfaces/parole.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.0 -->
<interface>
- <requires lib="gtk+" version="3.14"/>
+ <requires lib="gtk+" version="3.20"/>
<object class="GtkAdjustment" id="adjustment1">
<property name="upper">100</property>
<property name="step_increment">1</property>
diff --git a/data/interfaces/playlist.ui b/data/interfaces/playlist.ui
index 318c7ae..6d61677 100644
--- a/data/interfaces/playlist.ui
+++ b/data/interfaces/playlist.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.0 -->
<interface>
- <requires lib="gtk+" version="3.14"/>
+ <requires lib="gtk+" version="3.20"/>
<object class="GtkBox" id="playlist-box">
<property name="width_request">220</property>
<property name="visible">True</property>
diff --git a/data/interfaces/plugins.ui b/data/interfaces/plugins.ui
index edd444f..98fef10 100644
--- a/data/interfaces/plugins.ui
+++ b/data/interfaces/plugins.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.0 -->
<interface>
- <requires lib="gtk+" version="3.14"/>
+ <requires lib="gtk+" version="3.20"/>
<requires lib="libxfce4ui-2" version="4.11"/>
<object class="GtkListStore" id="liststore">
<columns>
diff --git a/data/interfaces/save-playlist.ui b/data/interfaces/save-playlist.ui
index 6002166..56b6e0c 100644
--- a/data/interfaces/save-playlist.ui
+++ b/data/interfaces/save-playlist.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.0 -->
<interface>
- <requires lib="gtk+" version="3.14"/>
+ <requires lib="gtk+" version="3.20"/>
<object class="GtkListStore" id="liststore">
<columns>
<!-- column-name filetype -->
diff --git a/data/interfaces/shortcuts.ui b/data/interfaces/shortcuts.ui
index 8fb01e2..ff0bba0 100644
--- a/data/interfaces/shortcuts.ui
+++ b/data/interfaces/shortcuts.ui
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <!-- interface-requires gtk+ 3.17 -->
-
+ <requires lib="gtk+" version="3.20"/>
<object class="GtkShortcutsWindow" id="shortcuts">
<property name="modal">1</property>
<child>
diff --git a/src/parole-medialist.c b/src/parole-medialist.c
index 12966ca..f45b04d 100644
--- a/src/parole-medialist.c
+++ b/src/parole-medialist.c
@@ -1412,12 +1412,6 @@ parole_media_list_setup_view(ParoleMediaList *list) {
gtk_tree_view_set_model(GTK_TREE_VIEW(list->priv->view), GTK_TREE_MODEL(list_store));
gtk_tree_view_set_model(GTK_TREE_VIEW(list->priv->disc_view), GTK_TREE_MODEL(disc_list_store));
-#if GTK_CHECK_VERSION(3, 14, 0)
-#else
- gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(list->priv->view), TRUE);
- gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(list->priv->disc_view), TRUE);
-#endif
-
list->priv->col = gtk_tree_view_column_new();
list->priv->disc_col = gtk_tree_view_column_new();
diff --git a/src/parole-player.c b/src/parole-player.c
index f90153f..5b78f09 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -2892,10 +2892,6 @@ static gboolean
parole_overlay_expose_event(GtkWidget *widget, cairo_t *cr, gpointer user_data) {
GtkAllocation *allocation = g_new0(GtkAllocation, 1);
GtkStyleContext *context;
-#if GTK_CHECK_VERSION(3, 16, 0)
-#else
- GdkRGBA acolor;
-#endif
gtk_widget_get_allocation(widget, allocation);
cairo_rectangle(cr, 0, 0, allocation->width, allocation->height);
@@ -2905,19 +2901,6 @@ parole_overlay_expose_event(GtkWidget *widget, cairo_t *cr, gpointer user_data)
gtk_style_context_add_class(context, "background");
gtk_style_context_add_class(context, "osd");
-#if GTK_CHECK_VERSION(3, 16, 0)
-#else
- gtk_style_context_get_background_color(context, GTK_STATE_NORMAL, &acolor);
- gdk_cairo_set_source_rgba(cr, &acolor);
- cairo_fill(cr);
-
- gtk_style_context_get_border_color(context, GTK_STATE_NORMAL, &acolor);
- gdk_cairo_set_source_rgba(cr, &acolor);
- cairo_move_to(cr, 0, 0);
- cairo_line_to(cr, allocation->width, 0);
- cairo_stroke(cr);
-#endif
-
return FALSE;
}
@@ -3109,10 +3092,6 @@ parole_player_init(ParolePlayer *player) {
GtkWidget *controls_overlay;
GtkWidget *controls_parent;
GtkWidget *play_box;
-#if GTK_CHECK_VERSION(3, 16, 0)
-#else
- GdkRGBA background;
-#endif
GdkPixbuf *logo;
/* Player Controls */
@@ -3301,12 +3280,6 @@ parole_player_init(ParolePlayer *player) {
/* Content Area (Background, Audio, Video) */
player->priv->eventbox_output = GTK_WIDGET(gtk_builder_get_object(builder, "content_area"));
-#if GTK_CHECK_VERSION(3, 16, 0)
-#else
- gdk_rgba_parse(&background, "black");
- gtk_widget_override_background_color(GTK_WIDGET(player->priv->eventbox_output), GTK_STATE_NORMAL, &background);
-#endif
-
// Enable motion-notify event to show/hide controls on mouseover
gtk_widget_add_events(GTK_WIDGET(player->priv->eventbox_output),
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list