[Xfce4-commits] [apps/xfce4-dict] 39/43: Bumping GTK version

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

andre pushed a commit to branch master
in repository apps/xfce4-dict.

commit 7b68a0e2f58434a8b7dc6040024ffc86ad3c131e
Author: Andre Miranda <andre42m at gmail.com>
Date:   Sat Oct 22 17:08:03 2016 -0300

    Bumping GTK version
---
 configure.ac.in   |  4 ++--
 lib/gui.c         | 20 +++++---------------
 lib/speedreader.c | 12 ++----------
 3 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index 61038f6..e8fef79 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -11,7 +11,7 @@ m4_define([xfce4_dict_version], [xfce4_dict_version_major().xfce4_dict_version_m
 dnl ***************************
 dnl *** Initialize autoconf ***
 dnl ***************************
-AC_COPYRIGHT([Copyright (c) 2006-2015 Xfce Development Team. All rights reserved.])
+AC_COPYRIGHT([Copyright (c) 2006-2016 Xfce Development Team. All rights reserved.])
 AC_INIT([xfce4-dict], [xfce4_dict_version], [http://bugzilla.xfce.org/], [xfce4-dict])
 AC_PREREQ([2.60])
 AC_CONFIG_MACRO_DIR([m4])
@@ -54,7 +54,7 @@ dnl ***********************************
 dnl *** Check for required packages ***
 dnl ***********************************
 XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.24.0])
-XDT_CHECK_PACKAGE([GTK], [gtk+-3.0], [3.14.0])
+XDT_CHECK_PACKAGE([GTK], [gtk+-3.0], [3.20.0])
 XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.12.0])
 XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.10.0])
 XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-2.0], [4.10.0])
diff --git a/lib/gui.c b/lib/gui.c
index 9a6b55d..1f453cc 100644
--- a/lib/gui.c
+++ b/lib/gui.c
@@ -227,14 +227,10 @@ static gboolean textview_visibility_notify_event(GtkWidget *text_view, GdkEventV
 {
 	gint wx, wy, bx, by;
 	GdkDevice *pointer;
+	GdkSeat *seat;
 
-#if GTK_CHECK_VERSION (3,2,0)
-    GdkSeat *seat = gdk_display_get_default_seat (gdk_display_get_default ());
-    pointer = gdk_seat_get_pointer (seat);
-#else
-    GdkDeviceManager *devman = gdk_display_get_device_manager (gdk_display_get_default ());
-    pointer = gdk_device_manager_get_client_pointer (devman);
-#endif
+	seat = gdk_display_get_default_seat (gdk_display_get_default ());
+	pointer = gdk_seat_get_pointer (seat);
 
 	gdk_window_get_device_position(gtk_widget_get_window (text_view),
 								   pointer, &wx, &wy, NULL);
@@ -257,14 +253,10 @@ static gchar *textview_get_text_at_cursor(DictData *dd)
 	{
 		gint wx, wy, bx, by;
 		GdkDevice *pointer;
+		GdkSeat *seat;
 
-#if GTK_CHECK_VERSION (3,2,0)
-		GdkSeat *seat = gdk_display_get_default_seat (gdk_display_get_default ());
+		seat = gdk_display_get_default_seat (gdk_display_get_default ());
 		pointer = gdk_seat_get_pointer (seat);
-#else
-		GdkDeviceManager *devman = gdk_display_get_device_manager (gdk_display_get_default ());
-		pointer = gdk_device_manager_get_client_pointer (devman);
-#endif
 
 		gdk_window_get_device_position(gtk_widget_get_window (dd->main_textview),
 									   pointer, &wx, &wy, NULL);
@@ -412,7 +404,6 @@ static gboolean textview_button_press_cb(GtkTextView *view, GdkEventButton *even
 }
 
 
-#if GTK_CHECK_VERSION(2, 12, 0)
 static gboolean textview_query_tooltip_cb(GtkWidget *widget, gint x, gint y, gboolean keyboard_mode,
 										  GtkTooltip *tooltip, DictData *dd)
 {
@@ -444,7 +435,6 @@ static gboolean textview_query_tooltip_cb(GtkWidget *widget, gint x, gint y, gbo
 	}
 	return FALSE;
 }
-#endif
 
 
 static void textview_apply_or_remove_tags(GtkTextBuffer *buffer, const gchar *tag,
diff --git a/lib/speedreader.c b/lib/speedreader.c
index b5aa558..ecf4b97 100644
--- a/lib/speedreader.c
+++ b/lib/speedreader.c
@@ -356,6 +356,8 @@ static void sr_start(XfdSpeedReader *dialog)
 	const gchar *fontname;
 	gchar *text, *cleaned_text;
 	GtkTextIter start, end;
+	gchar *css;
+	GtkCssProvider *provider;
 
 	/* clear the label text */
 	gtk_label_set_text(GTK_LABEL(priv->display_label), NULL);
@@ -380,10 +382,6 @@ static void sr_start(XfdSpeedReader *dialog)
 	/* set the font */
 	fontname = gtk_font_button_get_font_name(GTK_FONT_BUTTON(priv->button_font));
 
-#if GTK_CHECK_VERSION (3, 16, 0)
-	gchar *css;
-	GtkCssProvider *provider;
-
 	css = g_strdup_printf("* { font: %s; }", fontname);
 	provider = gtk_css_provider_new ();
 	gtk_css_provider_load_from_data (provider, css, -1, NULL);
@@ -392,12 +390,6 @@ static void sr_start(XfdSpeedReader *dialog)
 			GTK_STYLE_PROVIDER(provider),
 			GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
 	g_free(css);
-#else
-	PangoFontDescription *pfd;
-	pfd = pango_font_description_from_string(fontname);
-	gtk_widget_override_font(datetime->time_label, pfd);
-	pango_font_description_free(pfd);
-#endif
 
 	/* word grouping */
 	grouping = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(priv->spin_grouping));

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.