summaryrefslogtreecommitdiff
path: root/mate-dictionary
diff options
context:
space:
mode:
authormonsta <[email protected]>2018-01-28 22:19:00 +0300
committerraveit65 <[email protected]>2018-01-30 17:06:31 +0100
commit2165616a83855afbb1c9b69c736de2e7c7dfbdf8 (patch)
tree7ac83afa0d7b77e49e6bb7f8b02383693c207d22 /mate-dictionary
parent526b193ba678a7826af232526dfec0a37836a7e5 (diff)
downloadmate-utils-2165616a83855afbb1c9b69c736de2e7c7dfbdf8.tar.bz2
mate-utils-2165616a83855afbb1c9b69c736de2e7c7dfbdf8.tar.xz
require GTK+ 3.22 and GLib 2.50
Diffstat (limited to 'mate-dictionary')
-rw-r--r--mate-dictionary/libgdict/gdict-defbox.c9
-rw-r--r--mate-dictionary/src/gdict-applet.c17
-rw-r--r--mate-dictionary/src/gdict-pref-dialog.c4
-rw-r--r--mate-dictionary/src/gdict-sidebar.c4
-rw-r--r--mate-dictionary/src/gdict-source-dialog.c4
-rw-r--r--mate-dictionary/src/gdict-window.c4
6 files changed, 0 insertions, 42 deletions
diff --git a/mate-dictionary/libgdict/gdict-defbox.c b/mate-dictionary/libgdict/gdict-defbox.c
index 69d76329..ee48c3e5 100644
--- a/mate-dictionary/libgdict/gdict-defbox.c
+++ b/mate-dictionary/libgdict/gdict-defbox.c
@@ -1602,23 +1602,14 @@ defbox_visibility_notify_cb (GtkWidget *text_view,
GdictDefbox *defbox)
{
GdkDisplay *display;
-#if GTK_CHECK_VERSION (3, 20, 0)
GdkSeat *seat;
-#else
- GdkDeviceManager *device_manager;
-#endif
GdkDevice *pointer;
gint wx, wy;
gint bx, by;
display = gdk_window_get_display (event->window);
-#if GTK_CHECK_VERSION (3, 20, 0)
seat = gdk_display_get_default_seat (display);
pointer = gdk_seat_get_pointer (seat);
-#else
- device_manager = gdk_display_get_device_manager (display);
- pointer = gdk_device_manager_get_client_pointer (device_manager);
-#endif
gdk_window_get_device_position (gtk_widget_get_window (text_view), pointer, &wx, &wy, NULL);
gtk_text_view_window_to_buffer_coords (GTK_TEXT_VIEW (text_view),
diff --git a/mate-dictionary/src/gdict-applet.c b/mate-dictionary/src/gdict-applet.c
index 6269c5b1..817880dd 100644
--- a/mate-dictionary/src/gdict-applet.c
+++ b/mate-dictionary/src/gdict-applet.c
@@ -130,13 +130,8 @@ set_window_default_size (GdictApplet *applet)
GtkWidget *widget, *defbox;
gint width, height;
gint font_size;
-#if GTK_CHECK_VERSION (3, 22, 0)
GdkDisplay *display;
GdkMonitor *monitor_num;
-#else
- GdkScreen *screen;
- gint monitor_num;
-#endif
GtkRequisition req;
GdkRectangle monitor;
@@ -159,18 +154,10 @@ set_window_default_size (GdictApplet *applet)
height = MAX (height, req.height);
/* ... but make it no larger than half the monitor size */
-#if GTK_CHECK_VERSION (3, 22, 0)
display = gtk_widget_get_display (widget);
monitor_num = gdk_display_get_monitor_at_window (display,
gtk_widget_get_window (widget));
gdk_monitor_get_geometry (monitor_num, &monitor);
-#else
- screen = gtk_widget_get_screen (widget);
- monitor_num = gdk_screen_get_monitor_at_window (screen,
- gtk_widget_get_window (widget));
-
- gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor);
-#endif
width = MIN (width, monitor.width / 2);
height = MIN (height, monitor.height / 2);
@@ -729,11 +716,7 @@ gdict_applet_cmd_help (GtkAction *action,
{
GError *err = NULL;
-#if GTK_CHECK_VERSION (3, 22, 0)
gtk_show_uri_on_window (NULL,
-#else
- gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (applet)),
-#endif
"help:mate-dictionary/mate-dictionary-applet",
gtk_get_current_event_time (), &err);
diff --git a/mate-dictionary/src/gdict-pref-dialog.c b/mate-dictionary/src/gdict-pref-dialog.c
index 006d5711..e3563479 100644
--- a/mate-dictionary/src/gdict-pref-dialog.c
+++ b/mate-dictionary/src/gdict-pref-dialog.c
@@ -484,11 +484,7 @@ response_cb (GtkDialog *dialog,
switch (response_id)
{
case GTK_RESPONSE_HELP:
-#if GTK_CHECK_VERSION (3, 22, 0)
gtk_show_uri_on_window (GTK_WINDOW (dialog),
-#else
- gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (dialog)),
-#endif
"help:mate-dictionary/mate-dictionary-preferences",
gtk_get_current_event_time (), &err);
if (err)
diff --git a/mate-dictionary/src/gdict-sidebar.c b/mate-dictionary/src/gdict-sidebar.c
index 1a6e6d4b..4290bd6b 100644
--- a/mate-dictionary/src/gdict-sidebar.c
+++ b/mate-dictionary/src/gdict-sidebar.c
@@ -346,12 +346,8 @@ gdict_sidebar_init (GdictSidebar *sidebar)
select_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
priv->label = gtk_label_new (NULL);
-#if GTK_CHECK_VERSION (3, 16, 0)
gtk_label_set_xalign (GTK_LABEL (priv->label), 0.0);
gtk_label_set_yalign (GTK_LABEL (priv->label), 0.5);
-#else
- gtk_misc_set_alignment (GTK_MISC (priv->label), 0.0, 0.5);
-#endif
gtk_box_pack_start (GTK_BOX (select_hbox), priv->label, FALSE, FALSE, 0);
gtk_widget_show (priv->label);
diff --git a/mate-dictionary/src/gdict-source-dialog.c b/mate-dictionary/src/gdict-source-dialog.c
index 589ae962..f79b5a4a 100644
--- a/mate-dictionary/src/gdict-source-dialog.c
+++ b/mate-dictionary/src/gdict-source-dialog.c
@@ -469,11 +469,7 @@ gdict_source_dialog_response_cb (GtkDialog *dialog,
build_new_source (GDICT_SOURCE_DIALOG (dialog));
break;
case GTK_RESPONSE_HELP:
-#if GTK_CHECK_VERSION (3, 22, 0)
gtk_show_uri_on_window (GTK_WINDOW (dialog),
-#else
- gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (dialog)),
-#endif
"help:mate-dictionary/mate-dictionary-add-source",
gtk_get_current_event_time (), &err);
if (err)
diff --git a/mate-dictionary/src/gdict-window.c b/mate-dictionary/src/gdict-window.c
index 0bc300c4..07d05922 100644
--- a/mate-dictionary/src/gdict-window.c
+++ b/mate-dictionary/src/gdict-window.c
@@ -1244,11 +1244,7 @@ gdict_window_cmd_help_contents (GtkAction *action,
g_return_if_fail (GDICT_IS_WINDOW (window));
-#if GTK_CHECK_VERSION (3, 22, 0)
gtk_show_uri_on_window (GTK_WINDOW (window),
-#else
- gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (window)),
-#endif
"help:mate-dictionary",
gtk_get_current_event_time (), &err);
if (err)