[Xfce4-commits] [xfce/exo] 01/01: Require building of GTK3 library, drop some unused ifdefs

[noreply at xfce.org]

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 xfce/exo.

commit bc9c4990f8d371048c2a6ddb085894e2928dfb58
Author: Sean Davis <smd.seandavis at gmail.com>
Date:   Wed Jun 14 20:08:42 2017 -0400

    Require building of GTK3 library, drop some unused ifdefs
---
 configure.ac.in               | 13 ++-----------
 exo/Makefile.am               |  3 ---
 exo/exo-icon-chooser-dialog.c |  8 --------
 3 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index e228c23..e462cf2 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -166,22 +166,13 @@ dnl ***********************************
 XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.30.0])
 XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.30.0])
 XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.24.0])
+XDT_CHECK_PACKAGE([GTK3], [gtk+-3.0], [3.6.0])
 XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.30.0])
 XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.10.0])
 XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.10.0])
+XDT_CHECK_PACKAGE([LIBXFCE4UI2], [libxfce4ui-2], [4.12.0])
 XDT_CHECK_OPTIONAL_PACKAGE([GIO_UNIX], [gio-unix-2.0], [2.30.0], [gio-unix], [GIO-Unix features])
 
-dnl ***********************************************************
-dnl *** Optional support for a GTK+3 version of the library ***
-dnl ***********************************************************
-XDT_CHECK_OPTIONAL_PACKAGE([GTK3],
-                           [gtk+-3.0], [3.6.0], [gtk3],
-                           [GTK+ 3 support])
-XDT_CHECK_OPTIONAL_PACKAGE([LIBXFCE4UI2],
-                           [libxfce4ui-2], [4.12.0], [libxfce4ui2],
-                           [GTK+ 3 support: libxfce4ui-2])
-AM_CONDITIONAL([ENABLE_GTK3_LIBRARY], [test "x$GTK3_FOUND" = "xyes" && test "x$LIBXFCE4UI2_FOUND" = "xyes" ])
-
 dnl *********************
 dnl *** Check for X11 ***
 dnl *********************
diff --git a/exo/Makefile.am b/exo/Makefile.am
index 0074ea0..e67916e 100644
--- a/exo/Makefile.am
+++ b/exo/Makefile.am
@@ -114,7 +114,6 @@ pkgconfig_DATA = exo-$(LIBEXO_VERSION_API).pc
 ##
 ## GTK+ 3 support library
 ##
-if ENABLE_GTK3_LIBRARY
 
 libexo_2_includedir = $(includedir)/exo-2/exo
 
@@ -188,8 +187,6 @@ libexo_2_la_LIBADD =							\
 
 pkgconfig_DATA += exo-2.pc
 
-endif
-
 ##
 ## Rules to auto-generate built sources
 ##
diff --git a/exo/exo-icon-chooser-dialog.c b/exo/exo-icon-chooser-dialog.c
index 582d0a1..82825f9 100644
--- a/exo/exo-icon-chooser-dialog.c
+++ b/exo/exo-icon-chooser-dialog.c
@@ -81,11 +81,9 @@ static void     exo_icon_chooser_dialog_combo_changed            (GtkWidget
                                                                   ExoIconChooserDialog       *icon_chooser_dialog);
 static void     exo_icon_chooser_dialog_entry_changed            (GtkWidget                  *entry,
                                                                   ExoIconChooserDialog       *icon_chooser_dialog);
-#if GTK_CHECK_VERSION (2, 16, 0)
 static void     exo_icon_chooser_dialog_entry_clear              (GtkEntry                   *entry,
                                                                   GtkEntryIconPosition        icon_pos,
                                                                   GdkEvent                   *event);
-#endif
 static void     exo_icon_chooser_dialog_selection_changed        (ExoIconChooserDialog       *icon_chooser_dialog);
 
 
@@ -260,12 +258,10 @@ exo_icon_chooser_dialog_init (ExoIconChooserDialog *icon_chooser_dialog)
 #endif
   gtk_label_set_mnemonic_widget (GTK_LABEL (label), priv->filter_entry);
   g_signal_connect (G_OBJECT (priv->filter_entry), "changed", G_CALLBACK (exo_icon_chooser_dialog_entry_changed), icon_chooser_dialog);
-#if GTK_CHECK_VERSION (2, 16, 0)
   gtk_entry_set_icon_from_icon_name (GTK_ENTRY (priv->filter_entry), GTK_ENTRY_ICON_SECONDARY, "edit-clear");
   gtk_entry_set_icon_tooltip_text (GTK_ENTRY (priv->filter_entry), GTK_ENTRY_ICON_SECONDARY, _("Clear search field"));
   gtk_entry_set_icon_sensitive (GTK_ENTRY (priv->filter_entry), GTK_ENTRY_ICON_SECONDARY, FALSE);
   g_signal_connect (G_OBJECT (priv->filter_entry), "icon-release", G_CALLBACK (exo_icon_chooser_dialog_entry_clear), NULL);
-#endif
 
   /* setup the scrolled window for the icon chooser */
   scrolled_window = gtk_scrolled_window_new (NULL, NULL);
@@ -565,11 +561,9 @@ exo_icon_chooser_dialog_entry_changed (GtkWidget            *combo,
       g_free (normalized);
     }
 
-#if GTK_CHECK_VERSION (2, 16, 0)
   gtk_entry_set_icon_sensitive (GTK_ENTRY (priv->filter_entry),
                                 GTK_ENTRY_ICON_SECONDARY,
                                 !exo_str_is_empty (text));
-#endif
 
   model = exo_icon_view_get_model (EXO_ICON_VIEW (priv->icon_chooser));
   if (G_LIKELY (model != NULL))
@@ -578,7 +572,6 @@ exo_icon_chooser_dialog_entry_changed (GtkWidget            *combo,
 
 
 
-#if GTK_CHECK_VERSION (2, 16, 0)
 static void
 exo_icon_chooser_dialog_entry_clear (GtkEntry             *entry,
                                      GtkEntryIconPosition  icon_pos,
@@ -587,7 +580,6 @@ exo_icon_chooser_dialog_entry_clear (GtkEntry             *entry,
   if (icon_pos == GTK_ENTRY_ICON_SECONDARY)
     gtk_entry_set_text (entry, "");
 }
-#endif
 
 
 

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