[Xfce4-commits] [xfce/libxfce4ui] 01/01: Drop support for Gtk2
noreply at xfce.org
noreply at xfce.org
Wed Dec 4 23:10:31 CET 2019
This is an automated email from the git hooks/post-receive script.
o c h o s i 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/libxfce4ui.
commit 6d4ec5e1ae3d515af32696323c6347e8943ce81a
Author: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
Date: Wed Dec 4 11:01:03 2019 +0100
Drop support for Gtk2
Signed-off-by: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
Signed-off-by: Romain Bouvier <skunnyk at alteroot.org>
---
.gitignore | 2 -
configure.ac.in | 67 +--------
docs/Makefile.am | 4 +-
glade/Makefile.am | 41 ------
glade/icons/16x16/Makefile.am | 5 -
glade/icons/22x22/Makefile.am | 5 -
glade/libxfce4ui.xml.in | 18 ---
libxfce4kbd-private/Makefile.am | 46 ------
libxfce4kbd-private/libxfce4kbd-private-2.pc.in | 11 --
libxfce4kbd-private/xfce-shortcut-dialog.c | 65 +--------
libxfce4kbd-private/xfce-shortcuts-grabber.c | 25 ----
libxfce4kbd-private/xfce-shortcuts.c | 14 +-
libxfce4ui/Makefile.am | 36 -----
libxfce4ui/abicheck.sh | 2 +-
libxfce4ui/xfce-dialogs.c | 177 ------------------------
libxfce4ui/xfce-gdk-extensions.c | 17 ---
libxfce4ui/xfce-gtk-extensions.c | 20 +--
libxfce4ui/xfce-heading.c | 119 ----------------
libxfce4ui/xfce-sm-client.c | 2 -
libxfce4ui/xfce-spawn.c | 9 --
libxfce4ui/xfce-titled-dialog.c | 8 --
po/POTFILES.in | 2 +-
po/POTFILES.skip | 1 -
tests/Makefile.am | 27 ----
tests/test-ui.c | 98 +------------
25 files changed, 14 insertions(+), 807 deletions(-)
diff --git a/.gitignore b/.gitignore
index ef16680..66698a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,9 +13,7 @@ gtk-doc.make
install-sh
intltool-*.in
libtool
-libxfce4kbd-private/libxfce4kbd-private-2.pc
libxfce4kbd-private/libxfce4kbd-private-3.pc
-libxfce4ui/libxfce4ui-1.pc
libxfce4ui/libxfce4ui-2.pc
libxfce4ui/libxfce4ui-config.h
libxfce4ui/libxfce4ui-dialog-ui.ui~
diff --git a/configure.ac.in b/configure.ac.in
index 9c55f81..a928bfa 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -6,7 +6,7 @@ dnl ***************************
dnl *** Version information ***
dnl ***************************
m4_define([libxfce4ui_verinfo], [0:0:0])
-m4_define([libxfce4ui_version_api], [1])
+m4_define([libxfce4ui_version_api], [2])
m4_define([libxfce4ui_version_major], [4])
m4_define([libxfce4ui_version_minor], [14])
m4_define([libxfce4ui_version_micro], [1])
@@ -16,7 +16,7 @@ m4_define([libxfce4ui_version_tag], [git])
m4_define([libxfce4ui_version], [libxfce4ui_version_major().libxfce4ui_version_minor().libxfce4ui_version_micro()ifelse(libxfce4ui_version_nano(), [], [], [.libxfce4ui_version_nano()])ifelse(libxfce4ui_version_tag(), [git], [libxfce4ui_version_tag()-libxfce4ui_version_build()], [libxfce4ui_version_tag()])])
m4_define([libxfce4kbd_private_verinfo], [0:0:0])
-m4_define([libxfce4kbd_private_version_api], [2])
+m4_define([libxfce4kbd_private_version_api], [3])
dnl # DO NOT MODIFY ANYTHING BELOW THIS LINE, UNLESS YOU KNOW WHAT
dnl # YOU ARE DOING.
@@ -130,14 +130,6 @@ XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.42.0])
XDT_CHECK_PACKAGE([GTK3], [gtk+-3.0], [3.22.0])
XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.12.0])
-dnl ***********************************************************
-dnl *** Optional support for a GTK+2 version of the library ***
-dnl ***********************************************************
-XDT_CHECK_OPTIONAL_PACKAGE([GTK2],
- [gtk+-2.0], [2.24.0], [gtk2],
- [GTK+ 2 support])
-AM_CONDITIONAL([ENABLE_GTK2_LIBRARY], [test "x$GTK2_FOUND" = "xyes"])
-
dnl ****************************************************************
dnl *** Optional support for system information based on glibtop ***
dnl ****************************************************************
@@ -210,46 +202,6 @@ AC_MSG_RESULT([$with_manual_website])
dnl *********************************************************
dnl *** Optional support for the Glade Interface Designer ***
dnl *********************************************************
-dnl Do not try to build gladeui when gtk2 is disabled
-if test "x$GTK2_FOUND" = "xyes"; then
- XDT_CHECK_OPTIONAL_PACKAGE([GLADEUI], [gladeui-1.0],
- [3.5.0], [gladeui], [glade interface designer])
- AC_ARG_WITH([gladeui-catalogdir],
- [AC_HELP_STRING([--with-gladeui-catalogdir=PATH],
- [Specify where to install glade designer catalog files (default=autodetect)])],
- [gladeui_catalogdir="$withval"])
- AC_ARG_WITH([gladeui-moduledir],
- [AC_HELP_STRING([--with-gladeui-moduledir=PATH],
- [Specify where to install glade designer modules (default=autodetect)])],
- [gladeui_moduledir="$withval"])
- AC_ARG_WITH([gladeui-pixmapdir],
- [AC_HELP_STRING([--with-gladeui-pixmapdir=PATH],
- [Specify where to install glade designer pixmaps (default=autodetect)])],
- [gladeui_pixmapdir="$withval"])
- if test x"$GLADEUI_FOUND" = x"yes"; then
- if test x"$gladeui_catalogdir" = x""; then
- GLADEUI_CATALOGDIR=`$PKG_CONFIG "--variable=catalogdir" "gladeui-1.0"`
- else
- GLADEUI_CATALOGDIR="$gladeui_catalogdir"
- fi
- if test x"$gladeui_moduledir" = x""; then
- GLADEUI_MODULEDIR=`$PKG_CONFIG "--variable=moduledir" "gladeui-1.0"`
- else
- GLADEUI_MODULEDIR="$gladeui_moduledir"
- fi
- if test x"$gladeui_pixmapdir" = x""; then
- GLADEUI_PIXMAPDIR=`$PKG_CONFIG "--variable=pixmapdir" "gladeui-1.0"`
- else
- GLADEUI_PIXMAPDIR="$gladeui_pixmapdir"
- fi
- fi
- AC_SUBST([GLADEUI_CATALOGDIR])
- AC_SUBST([GLADEUI_MODULEDIR])
- AC_SUBST([GLADEUI_PIXMAPDIR])
-else
- dnl Hacky way to declare HAVE_GLADEUI false with --disable-gtk2
- AM_CONDITIONAL([HAVE_GLADEUI], false)
-fi
XDT_CHECK_OPTIONAL_PACKAGE([GLADEUI2], [gladeui-2.0],
[3.5.0], [gladeui2], [glade interface designer])
@@ -383,10 +335,8 @@ glade/icons/16x16/Makefile
glade/icons/22x22/Makefile
icons/Makefile
icons/48x48/Makefile
-libxfce4kbd-private/libxfce4kbd-private-2.pc
libxfce4kbd-private/libxfce4kbd-private-3.pc
libxfce4kbd-private/Makefile
-libxfce4ui/libxfce4ui-1.pc
libxfce4ui/libxfce4ui-2.pc
libxfce4ui/libxfce4ui-config.h
libxfce4ui/Makefile
@@ -401,19 +351,6 @@ dnl ***************************
echo
echo "Build Configuration:"
echo
-if test x"$GTK2_FOUND" = x"yes"; then
-echo "* GTK2 support: yes"
-else
-echo "* GTK2 support: no"
-fi
-if test x"$GLADEUI_FOUND" = x"yes"; then
-echo "* Glade Interface Designer: yes"
-echo " - Catalog directory: $GLADEUI_CATALOGDIR"
-echo " - Module directory: $GLADEUI_MODULEDIR"
-echo " - Pixmap directory: $GLADEUI_PIXMAPDIR"
-else
-echo "* Glade Interface Designer: no"
-fi
if test x"$GLADEUI2_FOUND" = x"yes"; then
echo "* Glade 3.0 Interface Designer: yes"
echo " - Catalog directory: $GLADEUI2_CATALOGDIR"
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 3e9ddae..f3e19ca 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -52,12 +52,12 @@ AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_builddir) \
$(LIBXFCE4UTIL_CFLAGS) \
- $(GTK2_CFLAGS) \
+ $(GTK3_CFLAGS) \
$(GTK_DOC_EXTRA_CFLAGS)
GTKDOC_LIBS = \
$(LIBXFCE4UTIL_LIBS) \
- $(GTK2_LIBS) \
+ $(GTK3_LIBS) \
$(top_builddir)/libxfce4ui/libxfce4ui-$(LIBXFCE4UI_VERSION_API).la
include $(top_srcdir)/gtk-doc.make
diff --git a/glade/Makefile.am b/glade/Makefile.am
index 71de258..ca74b9e 100644
--- a/glade/Makefile.am
+++ b/glade/Makefile.am
@@ -6,45 +6,6 @@ AM_CPPFLAGS = \
SUBDIRS = \
icons
-if HAVE_GLADEUI
-##
-## Glade module
-##
-glademoduledir = \
- $(GLADEUI_MODULEDIR)
-
-glademodule_LTLIBRARIES = \
- libxfce4uiglade.la
-
-libxfce4uiglade_la_SOURCES = \
- libxfce4ui-glade.c
-
-libxfce4uiglade_la_CFLAGS = \
- $(GLADEUI_CFLAGS) \
- $(LIBXFCE4UTIL_CFLAGS) \
- $(PLATFORM_CFLAGS)
-
-libxfce4uiglade_la_LDFLAGS = \
- -no-undefined \
- -avoid-version \
- -module \
- $(PLATFORM_LDFLAGS)
-
-libxfce4uiglade_la_LIBADD = \
- $(top_builddir)/libxfce4ui/libxfce4ui-1.la \
- $(LIBXFCE4UTIL_LIBS) \
- $(GLADEUI_LIBS)
-
-##
-## Glade catalog xml file
-##
-gladecatalogdir = \
- $(GLADEUI_CATALOGDIR)
-gladecatalog_DATA = \
- libxfce4ui.xml
- at INTLTOOL_XML_NOMERGE_RULE@
-endif
-
if HAVE_GLADEUI2
##
## Glade module
@@ -85,11 +46,9 @@ gladecatalog_DATA = \
endif
CLEANFILES = \
- libxfce4ui.xml \
libxfce4ui-2.xml
EXTRA_DIST = \
- libxfce4ui.xml.in \
libxfce4ui-2.xml.in
# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/glade/icons/16x16/Makefile.am b/glade/icons/16x16/Makefile.am
index 74cebfb..21dfaac 100644
--- a/glade/icons/16x16/Makefile.am
+++ b/glade/icons/16x16/Makefile.am
@@ -1,8 +1,3 @@
-if HAVE_GLADEUI
-iconsdir = $(GLADEUI_PIXMAPDIR)/hicolor/16x16/actions
-icons_DATA = widget-libxfce4ui-xfce-titled-dialog.png
-endif
-
if HAVE_GLADEUI2
iconsdir = $(GLADEUI2_PIXMAPDIR)/hicolor/16x16/actions
icons_DATA = widget-libxfce4ui-xfce-titled-dialog.png
diff --git a/glade/icons/22x22/Makefile.am b/glade/icons/22x22/Makefile.am
index 8155920..bf8b4d8 100644
--- a/glade/icons/22x22/Makefile.am
+++ b/glade/icons/22x22/Makefile.am
@@ -1,8 +1,3 @@
-if HAVE_GLADEUI
-iconsdir = $(GLADEUI_PIXMAPDIR)/hicolor/22x22/actions
-icons_DATA = widget-libxfce4ui-xfce-titled-dialog.png
-endif
-
if HAVE_GLADEUI2
iconsdir = $(GLADEUI2_PIXMAPDIR)/hicolor/22x22/actions
icons_DATA = widget-libxfce4ui-xfce-titled-dialog.png
diff --git a/glade/libxfce4ui.xml.in b/glade/libxfce4ui.xml.in
deleted file mode 100644
index 24afcfa..0000000
--- a/glade/libxfce4ui.xml.in
+++ /dev/null
@@ -1,18 +0,0 @@
-<glade-catalog name="libxfce4ui" supports="gtkbuilder" library="xfce4uiglade" version="4.5.0" book="xfce4" domain="glade3" depends="gtk+">
- <glade-widget-classes>
- <glade-widget-class name="XfceTitledDialog" generic-name="xfce-titled-dialog" _title="Titled Dialog">
- <post-create-function>glade_xfce_titled_dialog_post_create</post-create-function>
- <get-internal-child-function>glade_xfce_titled_dialog_get_internal_child</get-internal-child-function>
- <get-children-function>glade_xfce_titled_dialog_get_children</get-children-function>
- <properties>
- <property id="subtitle" ignore="False" translatable="True" _name="Subtitle"/>
- <property id="title" ignore="False" translatable="True"/>
- <property id="icon" ignore="True"/>
- <property id="icon-name" themed-icon="True" ignore="False"/>
- </properties>
- </glade-widget-class>
- </glade-widget-classes>
- <glade-widget-group name="xfce4-widgets" _title="Xfce 4 Widgets">
- <glade-widget-class-ref name="XfceTitledDialog"/>
- </glade-widget-group>
-</glade-catalog>
diff --git a/libxfce4kbd-private/Makefile.am b/libxfce4kbd-private/Makefile.am
index f1c9c5e..c481c36 100644
--- a/libxfce4kbd-private/Makefile.am
+++ b/libxfce4kbd-private/Makefile.am
@@ -75,52 +75,6 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libxfce4kbd-private-3.pc
-if ENABLE_GTK2_LIBRARY
-
-
-lib_LTLIBRARIES += libxfce4kbd-private-2.la
-
-libxfce4kbd_private_includedir = \
- $(includedir)/xfce4/libxfce4kbd-private-$(LIBXFCE4KBD_PRIVATE_VERSION_API)/libxfce4kbd-private
-
-libxfce4kbd_private_include_HEADERS = \
- $(libxfce4kbd_headers)
-
-libxfce4kbd_private_2_la_SOURCES = \
- $(libxfce4kbd_sources)
-
-libxfce4kbd_private_2_la_CFLAGS = \
- $(PLATFORM_CFLAGS) \
- $(GLIB_CFLAGS) \
- $(GTK2_CFLAGS) \
- $(LIBX11_CFLAGS) \
- $(LIBXFCE4UTIL_CFLAGS) \
- $(XFCONF_CFLAGS) \
- $(PLATFORM_CFLAGS)
-
-libxfce4kbd_private_2_la_LDFLAGS = \
- -export-dynamic \
- -version-info $(LIBXFCE4KBD_PRIVATE_VERINFO) \
- -export-symbols-regex "^[^_].*" \
- -no-undefined \
- $(LIBX11_LDFLAGS) \
- $(PLATFORM_LDFLAGS)
-
-libxfce4kbd_private_2_la_LIBADD = \
- $(top_builddir)/libxfce4ui/libxfce4ui-$(LIBXFCE4UI_VERSION_API).la \
- $(GLIB_LIBS) \
- $(GTK2_LIBS) \
- $(LIBX11_LIBS) \
- $(LIBXFCE4UTIL_LIBS) \
- $(XFCONF_LIBS)
-
-
-pkgconfig_DATA += libxfce4kbd-private-2.pc
-
-
-
-endif
-
if MAINTAINER_MODE
xfce-shortcuts-marshal.h: xfce-shortcuts-marshal.list Makefile
$(AM_V_GEN) glib-genmarshal --prefix=_xfce_shortcuts_marshal --internal --header $< > $@
diff --git a/libxfce4kbd-private/libxfce4kbd-private-2.pc.in b/libxfce4kbd-private/libxfce4kbd-private-2.pc.in
deleted file mode 100644
index b813376..0000000
--- a/libxfce4kbd-private/libxfce4kbd-private-2.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: libxfce4kbd-private
-Description: Private Xfce library for shared code between xfwm4 and xfce4-settings
-Requires: gdk-2.0 gtk+-2.0 libxfce4util-1.0 libxfconf-0 libxfce4ui-1
-Version: @PACKAGE_VERSION@
-Libs: @LIBX11_LDFLAGS@ -L${libdir} -lxfce4kbd-private- at LIBXFCE4KBD_PRIVATE_VERSION_API@
-Cflags: @LIBX11_CFLAGS@ -I${includedir}/xfce4/libxfce4kbd-private- at LIBXFCE4KBD_PRIVATE_VERSION_API@
diff --git a/libxfce4kbd-private/xfce-shortcut-dialog.c b/libxfce4kbd-private/xfce-shortcut-dialog.c
index 3c852e8..0a2f21e 100644
--- a/libxfce4kbd-private/xfce-shortcut-dialog.c
+++ b/libxfce4kbd-private/xfce-shortcut-dialog.c
@@ -43,12 +43,9 @@ static gboolean xfce_shortcut_dialog_key_pressed (XfceShortcutDialog *
GdkEventKey *event);
static gboolean xfce_shortcut_dialog_key_released (XfceShortcutDialog *dialog,
GdkEventKey *event);
-
-#if GTK_CHECK_VERSION (3, 0, 0)
static void xfce_shortcut_dialog_prepare_grab (GdkSeat *seat,
GdkWindow *window,
gpointer user_data);
-#endif
struct _XfceShortcutDialogClass
@@ -199,9 +196,6 @@ xfce_shortcut_dialog_create_contents (XfceShortcutDialog *dialog,
const gchar *action)
{
GtkWidget *content_box;
-#if !GTK_CHECK_VERSION (3, 14, 0)
- GtkWidget *alignment;
-#endif
GtkWidget *box;
GtkWidget *button;
GtkWidget *label;
@@ -240,46 +234,21 @@ xfce_shortcut_dialog_create_contents (XfceShortcutDialog *dialog,
/* Create clear button for xfwm4 */
if (g_utf8_collate (provider, "xfwm4") == 0)
{
-#if GTK_CHECK_VERSION (3, 10, 0)
button = gtk_button_new_from_icon_name ("edit-clear", GTK_ICON_SIZE_BUTTON);
-#else
- button = gtk_button_new_from_stock (GTK_STOCK_CLEAR);
-#endif
gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, GTK_RESPONSE_REJECT);
gtk_widget_show (button);
}
/* Create cancel button */
-#if GTK_CHECK_VERSION (3, 10, 0)
button = gtk_button_new_with_mnemonic (_("_Cancel"));
-#else
- button = gtk_button_new_from_stock (GTK_STOCK_CANCEL);
-#endif
gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, GTK_RESPONSE_CANCEL);
gtk_widget_show (button);
- /* Main content container */
-#if !GTK_CHECK_VERSION (3, 14, 0)
- alignment = gtk_alignment_new (0, 0, 1, 1);
- gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 0, 6, 12, 0);
- gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
- alignment);
- gtk_widget_show (alignment);
-#endif
-
-#if GTK_CHECK_VERSION (3, 0, 0)
content_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
-#else
- content_box = gtk_vbox_new (FALSE, 6);
-#endif
+
gtk_container_set_border_width (GTK_CONTAINER (content_box), 6);
-#if GTK_CHECK_VERSION (3, 14, 0)
gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
content_box);
-#else
- gtk_container_add (GTK_CONTAINER (alignment), content_box);
-#endif
- gtk_widget_show (content_box);
/* TRANSLATORS: this creates the explanation for the user. The first %s is replaced
* by the action type which you translated earlier, the second %s is replaced by the
@@ -293,11 +262,7 @@ xfce_shortcut_dialog_create_contents (XfceShortcutDialog *dialog,
label = gtk_label_new (NULL);
gtk_label_set_markup (GTK_LABEL (label), explanation_label_markup);
-#if GTK_CHECK_VERSION (3, 14, 0)
gtk_label_set_yalign (GTK_LABEL (label), 0.5);
-#else
- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-#endif
gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
gtk_container_add (GTK_CONTAINER (content_box), label);
gtk_widget_show (label);
@@ -306,29 +271,17 @@ xfce_shortcut_dialog_create_contents (XfceShortcutDialog *dialog,
/* Box and labels to display the shortcut currently being grabbed.
* It will be updated to key-press events. */
- #if GTK_CHECK_VERSION (3, 0, 0)
box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
- #else
- box = gtk_hbox_new (FALSE, 12);
- #endif
gtk_container_add (GTK_CONTAINER (content_box), box);
gtk_widget_show (box);
label = gtk_label_new (_("Shortcut:"));
-#if GTK_CHECK_VERSION (3, 14, 0)
gtk_label_set_yalign (GTK_LABEL (label), 0.5);
-#else
- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-#endif
gtk_container_add (GTK_CONTAINER (box), label);
gtk_widget_show (label);
dialog->shortcut_label = gtk_label_new (_("No keys pressed yet, proceed."));
-#if GTK_CHECK_VERSION (3, 14, 0)
gtk_label_set_yalign (GTK_LABEL (dialog->shortcut_label), 0.5);
-#else
- gtk_misc_set_alignment (GTK_MISC (dialog->shortcut_label), 0.0, 0.5);
-#endif
gtk_container_add (GTK_CONTAINER (box), dialog->shortcut_label);
gtk_widget_show (dialog->shortcut_label);
@@ -342,10 +295,8 @@ gint
xfce_shortcut_dialog_run (XfceShortcutDialog *dialog,
GtkWidget *parent)
{
-#if GTK_CHECK_VERSION (3, 0, 0)
GdkDisplay *display;
GdkSeat *seat;
-#endif
gint response = GTK_RESPONSE_CANCEL;
g_return_val_if_fail (XFCE_IS_SHORTCUT_DIALOG (dialog), GTK_RESPONSE_CANCEL);
@@ -353,7 +304,6 @@ xfce_shortcut_dialog_run (XfceShortcutDialog *dialog,
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (parent));
gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), TRUE);
-#if GTK_CHECK_VERSION (3, 0, 0)
display = gtk_widget_get_display (GTK_WIDGET (dialog));
seat = gdk_display_get_default_seat (display);
@@ -362,10 +312,6 @@ xfce_shortcut_dialog_run (XfceShortcutDialog *dialog,
gdk_screen_get_root_window (gdk_display_get_default_screen (display)),
GDK_SEAT_CAPABILITY_ALL, TRUE, NULL, NULL,
xfce_shortcut_dialog_prepare_grab, NULL) == GDK_GRAB_SUCCESS)
-#else
- /* Take control on the keyboard */
- if (G_LIKELY (gdk_keyboard_grab (gtk_widget_get_root_window (GTK_WIDGET (dialog)), TRUE, GDK_CURRENT_TIME) == GDK_GRAB_SUCCESS))
-#endif
{
/* Run the dialog and wait for the user to enter a valid shortcut */
response = gtk_dialog_run (GTK_DIALOG (dialog));
@@ -377,13 +323,8 @@ xfce_shortcut_dialog_run (XfceShortcutDialog *dialog,
dialog->shortcut = g_strdup ("");
}
-#if GTK_CHECK_VERSION (3, 0, 0)
/* Release keyboard */
gdk_seat_ungrab (seat);
-#else
- /* Release keyboard */
- gdk_keyboard_ungrab (GDK_CURRENT_TIME);
-#endif
}
else
{
@@ -470,10 +411,8 @@ xfce_shortcut_dialog_key_released (XfceShortcutDialog *dialog,
/* Check if the shortcut was accepted */
if (G_LIKELY (shortcut_accepted))
{
-#if !GTK_CHECK_VERSION (3, 0, 0)
/* Release keyboard */
gdk_keyboard_ungrab (GDK_CURRENT_TIME);
-#endif
/* Exit dialog with positive response */
gtk_dialog_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
@@ -517,7 +456,6 @@ xfce_shortcut_dialog_get_action_name (XfceShortcutDialog *dialog)
-#if GTK_CHECK_VERSION (3, 0, 0)
static void
xfce_shortcut_dialog_prepare_grab (GdkSeat *seat,
GdkWindow *window,
@@ -525,4 +463,3 @@ xfce_shortcut_dialog_prepare_grab (GdkSeat *seat,
{
gdk_window_show_unraised (window);
}
-#endif
diff --git a/libxfce4kbd-private/xfce-shortcuts-grabber.c b/libxfce4kbd-private/xfce-shortcuts-grabber.c
index e085cdb..84ec447 100644
--- a/libxfce4kbd-private/xfce-shortcuts-grabber.c
+++ b/libxfce4kbd-private/xfce-shortcuts-grabber.c
@@ -241,11 +241,7 @@ xfce_shortcuts_grabber_grab (XfceShortcutsGrabber *grabber,
g_return_if_fail (key != NULL);
display = gdk_display_get_default ();
-#if GTK_CHECK_VERSION (3, 10, 0)
screens = 1;
-#else
- screens = gdk_display_get_n_screens (display);
-#endif
keymap = gdk_keymap_get_for_display (display);
/* Map virtual modifiers to non-virtual modifiers */
@@ -321,15 +317,9 @@ xfce_shortcuts_grabber_grab (XfceShortcutsGrabber *grabber,
numlock_modifier | GDK_MOD2_MASK | GDK_LOCK_MASK | GDK_MOD5_MASK,
};
-#if GTK_CHECK_VERSION (3, 0, 0)
/* Retrieve the root window of the screen */
root_window = GDK_WINDOW_XID (gdk_screen_get_root_window (gdk_display_get_default_screen (display)));
gdk_x11_display_error_trap_push (display);
-#else
- /* Retrieve the root window of the screen */
- root_window = GDK_WINDOW_XWINDOW (gdk_screen_get_root_window (gdk_display_get_screen (display, j)));
- gdk_error_trap_push ();
-#endif
for (k = 0; k < G_N_ELEMENTS (mod_masks); k++)
{
@@ -349,15 +339,9 @@ xfce_shortcuts_grabber_grab (XfceShortcutsGrabber *grabber,
root_window);
}
-#if GTK_CHECK_VERSION (3, 0, 0)
gdk_display_flush (display);
if (gdk_x11_display_error_trap_pop (display))
-#else
- gdk_flush ();
-
- if (gdk_error_trap_pop ())
-#endif
{
if (grab)
TRACE ("Failed to grab");
@@ -433,11 +417,7 @@ xfce_shortcuts_grabber_event_filter (GdkXEvent *gdk_xevent,
/* Get the keyboard state */
display = gdk_display_get_default ();
-#if GTK_CHECK_VERSION (3, 0, 0)
gdk_x11_display_error_trap_push (display);
-#else
- gdk_error_trap_push ();
-#endif
keymap = gdk_keymap_get_for_display (display);
mod_mask = gtk_accelerator_get_default_mod_mask ();
modifiers = xevent->xkey.state;
@@ -499,13 +479,8 @@ xfce_shortcuts_grabber_event_filter (GdkXEvent *gdk_xevent,
g_signal_emit_by_name (grabber, "shortcut-activated",
context.result, timestamp);
-#if GTK_CHECK_VERSION (3, 0, 0)
gdk_display_flush (display);
gdk_x11_display_error_trap_pop_ignored (display);
-#else
- gdk_flush ();
- gdk_error_trap_pop ();
-#endif
return GDK_FILTER_CONTINUE;
}
diff --git a/libxfce4kbd-private/xfce-shortcuts.c b/libxfce4kbd-private/xfce-shortcuts.c
index af2b86e..c81fa5e 100644
--- a/libxfce4kbd-private/xfce-shortcuts.c
+++ b/libxfce4kbd-private/xfce-shortcuts.c
@@ -154,11 +154,7 @@ xfce_shortcut_conflict_dialog (GtkWindow *parent,
other_button_text = g_strdup_printf (_(conflict_messages[i].other_button_text), other_action_name);
response = xfce_message_dialog (parent, title,
-#if !GTK_CHECK_VERSION (3, 10, 0)
- GTK_STOCK_DIALOG_QUESTION,
-#else
"dialog-question",
-#endif
title, secondary_text,
XFCE_BUTTON_TYPE_MIXED, NULL, owner_button_text, GTK_RESPONSE_ACCEPT,
XFCE_BUTTON_TYPE_MIXED, NULL, other_button_text, GTK_RESPONSE_REJECT,
@@ -178,17 +174,9 @@ xfce_shortcut_conflict_dialog (GtkWindow *parent,
if (G_UNLIKELY (!handled))
{
xfce_message_dialog (parent, title,
-#if !GTK_CHECK_VERSION (3, 10, 0)
- GTK_STOCK_DIALOG_ERROR,
-#else
"dialog-error",
-#endif
title, _("This shortcut is already being used for something else."),
-#if !GTK_CHECK_VERSION (3, 10, 0)
- GTK_STOCK_CLOSE,
-#else
- "window-close",
-#endif
+ "window-close-symbolic",
GTK_RESPONSE_CLOSE, NULL);
response = GTK_RESPONSE_REJECT;
}
diff --git a/libxfce4ui/Makefile.am b/libxfce4ui/Makefile.am
index 49446a6..21bcf75 100644
--- a/libxfce4ui/Makefile.am
+++ b/libxfce4ui/Makefile.am
@@ -143,42 +143,6 @@ endif
# endif HAVE_INTROSPECTION
-##
-## GTK+ 2 support library
-##
-if ENABLE_GTK2_LIBRARY
-
-lib_LTLIBRARIES += \
- libxfce4ui-1.la
-
-libxfce4ui_1_la_SOURCES = \
- $(libxfce4ui_sources)
-
-libxfce4ui_1_la_CFLAGS = \
- $(LIBSM_CFLAGS) \
- $(GTK2_CFLAGS) \
- $(LIBSTARTUP_NOTIFICATION_CFLAGS) \
- $(LIBXFCE4UTIL_CFLAGS) \
- $(PLATFORM_CFLAGS)
-
-libxfce4ui_1_la_LDFLAGS = \
- -version-info $(LIBXFCE4UI_VERINFO) \
- -export-symbols-regex "^[^_].*" \
- -no-undefined \
- $(LIBSM_LDFLAGS) \
- $(PLATFORM_LDFLAGS)
-
-libxfce4ui_1_la_LIBADD = \
- $(LIBSM_LIBS) \
- $(GTK2_LIBS) \
- $(LIBSTARTUP_NOTIFICATION_LIBS) \
- $(LIBXFCE4UTIL_LIBS)
-
-pkgconfig_DATA += \
- libxfce4ui-1.pc
-
-
-endif
##
## Rules to auto-generate built sources
diff --git a/libxfce4ui/abicheck.sh b/libxfce4ui/abicheck.sh
index 15ea181..105edea 100755
--- a/libxfce4ui/abicheck.sh
+++ b/libxfce4ui/abicheck.sh
@@ -20,5 +20,5 @@
trap 'rm expected-abi actual-abi' EXIT
${CPP:-cpp} -DINCLUDE_INTERNAL_SYMBOLS -DINCLUDE_VARIABLES -DALL_FILES ${srcdir:-.}/libxfce4ui.symbols | sed 's/ G_GNUC.*$//;s/ PRIVATE//;/^ *$/d;/^#/d' | sort >expected-abi
-${NM:-nm} .libs/libxfce4ui-1.so* | awk '/ [DRTG] / {print $3}' | sort | uniq > actual-abi
+${NM:-nm} .libs/libxfce4ui-2.so* | awk '/ [DRTG] / {print $3}' | sort | uniq > actual-abi
diff -u expected-abi actual-abi
diff --git a/libxfce4ui/xfce-dialogs.c b/libxfce4ui/xfce-dialogs.c
index 0ffd6a2..506a018 100644
--- a/libxfce4ui/xfce-dialogs.c
+++ b/libxfce4ui/xfce-dialogs.c
@@ -101,11 +101,7 @@ xfce_dialog_show_help_uri (GdkScreen *screen,
else
{
/* not very likely to happen, but it is possible exo is not installed */
-#if GTK_CHECK_VERSION (3, 22, 0)
result = gtk_show_uri_on_window (parent, uri->str, gtk_get_current_event_time (), &error);
-#else
- result = gtk_show_uri (screen, uri->str, gtk_get_current_event_time (), &error);
-#endif
}
if (!result)
@@ -272,26 +268,14 @@ xfce_dialog_show_help_with_version (GtkWindow *parent,
dialog = xfce_message_dialog_new (parent,
_("Online Documentation"),
-#if !GTK_CHECK_VERSION (3, 10, 0)
- GTK_STOCK_DIALOG_QUESTION,
-#else
"dialog-question",
-#endif
primary,
_("You will be redirected to the documentation website "
"where the help pages are maintained and translated."),
-#if !GTK_CHECK_VERSION (3, 10, 0)
- GTK_STOCK_CANCEL,
-#else
"gtk-cancel",
-#endif
GTK_RESPONSE_NO,
XFCE_BUTTON_TYPE_MIXED,
-#if !GTK_CHECK_VERSION (3, 10, 0)
- GTK_STOCK_HELP,
-#else
"help-browser",
-#endif
_("_Read Online"),
GTK_RESPONSE_YES,
NULL);
@@ -303,10 +287,8 @@ xfce_dialog_show_help_with_version (GtkWindow *parent,
button = gtk_check_button_new_with_mnemonic (_("_Always go directly to the online documentation"));
gtk_box_pack_end (GTK_BOX (message_box), button, FALSE, TRUE, 0);
-#if GTK_CHECK_VERSION (3, 0, 0)
g_object_set (G_OBJECT (button), "halign", GTK_ALIGN_END, "margin-start", 8, "margin-end", 8, NULL);
gtk_widget_set_hexpand (button, TRUE);
-#endif
g_signal_connect (G_OBJECT (button), "toggled",
G_CALLBACK (xfce_dialog_show_help_auto_toggled), NULL);
gtk_widget_show (button);
@@ -350,17 +332,9 @@ xfce_dialog_show_info (GtkWindow *parent,
va_end (args);
xfce_message_dialog (parent, _("Information"),
-#if !GTK_CHECK_VERSION (3, 10, 0)
- GTK_STOCK_DIALOG_INFO,
-#else
"dialog-information",
-#endif
primary_text, secondary_text,
-#if !GTK_CHECK_VERSION (3, 10, 0)
- GTK_STOCK_CLOSE,
-#else
XFCE_BUTTON_TYPE_MIXED, "window-close-symbolic", _("Close"),
-#endif
GTK_RESPONSE_CLOSE, NULL);
g_free (primary_text);
@@ -393,17 +367,9 @@ xfce_dialog_show_warning (GtkWindow *parent,
va_end (args);
xfce_message_dialog (parent, _("Warning"),
-#if !GTK_CHECK_VERSION (3, 10, 0)
- GTK_STOCK_DIALOG_WARNING,
-#else
"dialog-warning",
-#endif
primary_text, secondary_text,
-#if !GTK_CHECK_VERSION (3, 10, 0)
- GTK_STOCK_CLOSE,
-#else
XFCE_BUTTON_TYPE_MIXED, "window-close-symbolic", _("Close"),
-#endif
GTK_RESPONSE_CLOSE, NULL);
g_free (primary_text);
@@ -437,17 +403,9 @@ xfce_dialog_show_error (GtkWindow *parent,
va_end (args);
xfce_message_dialog (parent, _("Error"),
-#if !GTK_CHECK_VERSION (3, 10, 0)
- GTK_STOCK_DIALOG_ERROR,
-#else
"dialog-error",
-#endif
primary_text, error ? error->message : NULL,
-#if !GTK_CHECK_VERSION (3, 10, 0)
- GTK_STOCK_CLOSE,
-#else
XFCE_BUTTON_TYPE_MIXED, "window-close-symbolic", _("Close"),
-#endif
GTK_RESPONSE_CLOSE, NULL);
g_free (primary_text);
@@ -494,24 +452,15 @@ xfce_dialog_confirm (GtkWindow *parent,
/* whether this will be a yes/no dialog */
if (stock_id != NULL && (strcmp (stock_id, "gtk-yes") == 0 || strcmp (stock_id, "yes") == 0))
{
-#if GTK_CHECK_VERSION (3, 10, 0)
no_stock_id = _("No");
if (confirm_label == NULL)
confirm_label = _("Yes");
-#else
- no_stock_id = GTK_STOCK_NO;
-#endif
}
else
{
-#if GTK_CHECK_VERSION (3, 10, 0)
no_stock_id = _("Cancel");
-#else
- no_stock_id = GTK_STOCK_CANCEL;
-#endif
}
-#if GTK_CHECK_VERSION (3, 0, 0)
response_id = xfce_message_dialog (parent, _("Question"),
"dialog-question",
primary_text,
@@ -519,15 +468,6 @@ xfce_dialog_confirm (GtkWindow *parent,
no_stock_id, GTK_RESPONSE_NO,
XFCE_BUTTON_TYPE_MIXED, stock_id, confirm_label, GTK_RESPONSE_YES,
NULL);
-#else
- response_id = xfce_message_dialog (parent, _("Question"),
- GTK_STOCK_DIALOG_QUESTION,
- primary_text,
- secondary_text,
- no_stock_id, GTK_RESPONSE_NO,
- XFCE_BUTTON_TYPE_MIXED, stock_id, confirm_label, GTK_RESPONSE_YES,
- NULL);
-#endif
g_free (primary_text);
@@ -583,11 +523,7 @@ xfce_dialog_confirm_close_tabs (GtkWindow *parent,
secondary_text = g_strdup_printf (_("This window has %d tabs open. Closing this window\n"
"will also close all its tabs."), num_tabs);
-#if GTK_CHECK_VERSION (3, 0, 0)
warning_icon = "dialog-warning";
-#else
- warning_icon = GTK_STOCK_DIALOG_WARNING;
-#endif
dialog = xfce_message_dialog_new (parent, _("Warning"),
warning_icon,
@@ -643,7 +579,6 @@ xfce_message_dialog_new_valist (GtkWindow *parent,
const gchar *first_button_text,
va_list args)
{
-#if GTK_CHECK_VERSION (3, 0, 0)
GtkBuilder *gxml;
GtkWidget *dialog;
GtkWidget *dialog_image;
@@ -783,120 +718,8 @@ xfce_message_dialog_new_valist (GtkWindow *parent,
}
g_object_unref (gxml);
- return dialog;
-#else /* GTK2 */
- GtkWidget *dialog;
- GtkWidget *image;
- GtkWidget *button;
- const gchar *text = first_button_text;
- const gchar *label;
- const gchar *stock_id;
- gint response;
- GdkPixbuf *pixbuf, *scaled;
- gint w, h;
-
- g_return_val_if_fail (primary_text != NULL || secondary_text != NULL, NULL);
- g_return_val_if_fail (parent == NULL || GTK_IS_WINDOW (parent), NULL);
-
- if (G_LIKELY (primary_text != NULL))
- {
- /* create dialog with large bold text */
- dialog = gtk_message_dialog_new_with_markup (parent,
- GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL,
- GTK_MESSAGE_OTHER, GTK_BUTTONS_NONE,
- "<span weight='bold' size='large'>%s</span>",
- primary_text);
-
- if (secondary_text != NULL)
- gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s", secondary_text);
- }
- else
- {
- /* create dialog with normal seconday text */
- dialog = gtk_message_dialog_new (parent,
- GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL,
- GTK_MESSAGE_OTHER, GTK_BUTTONS_NONE,
- "%s", secondary_text);
- }
-
- if (title != NULL)
- gtk_window_set_title (GTK_WINDOW (dialog), title);
-
- /* put the dialog on the active screen if no parent is defined */
- if (parent == NULL)
- xfce_gtk_window_center_on_active_screen (GTK_WINDOW (dialog));
-
- /* add buttons */
- while (text != NULL)
- {
- if (strcmp (text, XFCE_BUTTON_TYPE_MIXED) == 0)
- {
- /* get arguments */
- stock_id = va_arg (args, const gchar *);
- label = va_arg (args, const gchar *);
- response = va_arg (args, gint);
-
- /* add a mixed button to the dialog */
- button = xfce_gtk_button_new_mixed (stock_id, label);
- gtk_widget_set_can_default (button, TRUE);
- gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, response);
- gtk_widget_show (button);
- }
- else if (strcmp (text, XFCE_BUTTON_TYPE_PIXBUF) == 0)
- {
- /* get arguments */
- pixbuf = va_arg (args, GdkPixbuf *);
- label = va_arg (args, const gchar *);
- response = va_arg (args, gint);
-
- /* lookup real icons size for button icons */
- gtk_icon_size_lookup (GTK_ICON_SIZE_BUTTON, &w, &h);
-
- /* scale the pixbuf if needed */
- if (gdk_pixbuf_get_width (pixbuf) != w || gdk_pixbuf_get_height (pixbuf) != h)
- scaled = gdk_pixbuf_scale_simple (pixbuf, w, h, GDK_INTERP_BILINEAR);
- else
- scaled = NULL;
-
- image = gtk_image_new_from_pixbuf (scaled ? scaled : pixbuf);
-
- /* release scaled image */
- if (scaled != NULL)
- g_object_unref (G_OBJECT (scaled));
-
- /* create button and add it to the dialog */
- button = gtk_button_new_with_label (label);
- gtk_button_set_image (GTK_BUTTON (button), image);
- gtk_widget_set_can_default (button, TRUE);
- gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, response);
- gtk_widget_show (button);
- }
- else /* stock button */
- {
- /* get arguments */
- stock_id = text;
- response = va_arg (args, gint);
-
- /* add a stock button to the dialog */
- gtk_dialog_add_button (GTK_DIALOG (dialog), stock_id, response);
- }
-
- /* get the next argument */
- text = va_arg (args, const gchar *);
- }
-
- if (icon_stock_id != NULL)
- {
- /* set dialog and window icon */
- image = gtk_image_new_from_stock (icon_stock_id, GTK_ICON_SIZE_DIALOG);
- gtk_message_dialog_set_image (GTK_MESSAGE_DIALOG (dialog), image);
-
- gtk_widget_show (image);
- gtk_window_set_icon_name (GTK_WINDOW (dialog), icon_stock_id);
- }
return dialog;
-#endif /* GTK_CHECK_VERSION */
}
diff --git a/libxfce4ui/xfce-gdk-extensions.c b/libxfce4ui/xfce-gdk-extensions.c
index a3466f8..9711fa6 100644
--- a/libxfce4ui/xfce-gdk-extensions.c
+++ b/libxfce4ui/xfce-gdk-extensions.c
@@ -64,16 +64,11 @@ xfce_gdk_screen_get_active (gint *monitor_return)
gint rootx, rooty;
GdkScreen *screen;
-#if GTK_CHECK_VERSION (3, 22, 0)
GdkSeat *seat;
display = gdk_display_get_default ();
seat = gdk_display_get_default_seat (display);
gdk_device_get_position (gdk_seat_get_pointer (seat), &screen, &rootx, &rooty);
-#else
- display = gdk_display_get_default ();
- gdk_display_get_pointer (display, &screen, &rootx, &rooty, NULL);
-#endif
if (G_UNLIKELY (screen == NULL))
{
@@ -85,11 +80,7 @@ xfce_gdk_screen_get_active (gint *monitor_return)
{
/* return the monitor number */
if (monitor_return != NULL)
-#if GTK_CHECK_VERSION (3, 22, 0)
*monitor_return = 0;
-#else
- *monitor_return = gdk_screen_get_monitor_at_point (screen, rootx, rooty);
-#endif
}
return screen;
@@ -111,8 +102,6 @@ GdkRectangle *
xfce_gdk_screen_get_geometry (void)
{
GdkRectangle *geometry;
-
-#if GTK_CHECK_VERSION (3, 22, 0)
gint x, y, w, h;
int num_monitors;
GdkDisplay *display;
@@ -140,12 +129,6 @@ xfce_gdk_screen_get_geometry (void)
geometry->width = w - x;
geometry->height = h - y;
-#else
- geometry = g_new0 (GdkRectangle, 1);
-
- geometry->width = gdk_screen_width ();
- geometry->height = gdk_screen_height ();
-#endif
return geometry;
}
diff --git a/libxfce4ui/xfce-gtk-extensions.c b/libxfce4ui/xfce-gtk-extensions.c
index fe164f9..01ee1c7 100644
--- a/libxfce4ui/xfce-gtk-extensions.c
+++ b/libxfce4ui/xfce-gtk-extensions.c
@@ -79,23 +79,13 @@ xfce_gtk_button_new_mixed (const gchar *stock_id,
if (stock_id != NULL && strlen(stock_id) > 0)
{
/* create image widget */
-#if !GTK_CHECK_VERSION (3, 10, 0)
- if (g_str_has_prefix (stock_id, "gtk-"))
- image = gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_BUTTON);
- else
-#endif
- image = gtk_image_new_from_icon_name (stock_id, GTK_ICON_SIZE_BUTTON);
+ image = gtk_image_new_from_icon_name (stock_id, GTK_ICON_SIZE_BUTTON);
gtk_button_set_image (GTK_BUTTON (button), image);
}
}
else
{
-#if !GTK_CHECK_VERSION (3, 10, 0)
- /* fall back to a stock button */
- button = gtk_button_new_from_stock (stock_id);
-#else
button = gtk_button_new_with_label (label);
-#endif
}
return button;
@@ -140,11 +130,7 @@ xfce_gtk_frame_box_new (const gchar *label,
frame_label = gtk_label_new (markup_label);
gtk_label_set_use_markup (GTK_LABEL (frame_label), TRUE);
g_free (markup_label);
-#if GTK_CHECK_VERSION (3, 14, 0)
- gtk_label_set_yalign (GTK_LABEL (frame_label), 0.5);
-#else
- gtk_misc_set_alignment (GTK_MISC (frame_label), 0.0, 0.5);
-#endif
+ gtk_label_set_yalign (GTK_LABEL (frame_label), 0.5);
gtk_frame_set_label_widget (GTK_FRAME (frame), frame_label);
gtk_widget_show (frame_label);
}
@@ -237,7 +223,7 @@ xfce_gtk_window_center_on_active_screen (GtkWindow *window)
* or will keep trying for up to 250ms. It will also return a value indicating
* whether the menu was eventually mapped or not. Following is an excerpt from
* the GTK+ Documentation on #GtkMenu.
- *
+ *
* Displays a menu and makes it available for selection.
*
* Applications can use this function to display context-sensitive menus, and will
diff --git a/libxfce4ui/xfce-heading.c b/libxfce4ui/xfce-heading.c
index c812725..fa00141 100644
--- a/libxfce4ui/xfce-heading.c
+++ b/libxfce4ui/xfce-heading.c
@@ -43,7 +43,6 @@ static void _xfce_heading_finalize (GObject *object
static void _xfce_heading_realize (GtkWidget *widget);
static void _xfce_heading_size_request (GtkWidget *widget,
GtkRequisition *requisition);
-#if GTK_CHECK_VERSION (3, 0, 0)
static void _xfce_heading_get_preferred_width (GtkWidget *widget,
gint *min,
gint *natural);
@@ -52,12 +51,6 @@ static void _xfce_heading_get_preferred_height (GtkWidget *widget
gint *natural);
static gboolean _xfce_heading_draw (GtkWidget *widget,
cairo_t *ctx);
-#else
-static void _xfce_heading_style_set (GtkWidget *widget,
- GtkStyle *previous_style);
-static gboolean _xfce_heading_expose_event (GtkWidget *widget,
- GdkEventExpose *event);
-#endif
static AtkObject *_xfce_heading_get_accessible (GtkWidget *widget);
static PangoLayout *_xfce_heading_make_layout (XfceHeading *heading);
static GdkPixbuf *_xfce_heading_make_pixbuf (XfceHeading *heading);
@@ -100,15 +93,9 @@ _xfce_heading_class_init (XfceHeadingClass *klass)
gtkwidget_class = GTK_WIDGET_CLASS (klass);
gtkwidget_class->realize = _xfce_heading_realize;
gtkwidget_class->get_accessible = _xfce_heading_get_accessible;
-#if GTK_CHECK_VERSION (3, 0, 0)
gtkwidget_class->get_preferred_width = _xfce_heading_get_preferred_width;
gtkwidget_class->get_preferred_height = _xfce_heading_get_preferred_height;
gtkwidget_class->draw = _xfce_heading_draw;
-#else
- gtkwidget_class->size_request = _xfce_heading_size_request;
- gtkwidget_class->style_set = _xfce_heading_style_set;
- gtkwidget_class->expose_event = _xfce_heading_expose_event;
-#endif
}
@@ -156,40 +143,21 @@ _xfce_heading_realize (GtkWidget *widget)
attributes.y = allocation.y;
attributes.width = allocation.width;
attributes.height = allocation.height;
-#if !GTK_CHECK_VERSION (3, 0, 0)
- attributes.colormap = gtk_widget_get_colormap (widget);
-#endif
attributes.wclass = GDK_INPUT_OUTPUT;
attributes.window_type = GDK_WINDOW_CHILD;
attributes.visual = gtk_widget_get_visual (widget);
attributes.event_mask = gtk_widget_get_events (widget)
| GDK_EXPOSURE_MASK;
-#if GTK_CHECK_VERSION (3, 0, 0)
/* allocate the widget window */
window = gdk_window_new (gtk_widget_get_parent_window (widget), &attributes,
GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL);
gtk_widget_set_window (widget, window);
gdk_window_set_user_data (window, widget);
-#else
- /* allocate the widget window */
- window = gdk_window_new (gtk_widget_get_parent_window (widget), &attributes,
- GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP);
- gtk_widget_set_window (widget, window);
- gdk_window_set_user_data (window, widget);
-
- /* connect the style to the window */
- gtk_widget_style_attach (widget);
-
- /* set background color (using the base color) */
- gdk_window_set_background (gtk_widget_get_window (widget),
- >k_widget_get_style (widget)->base[GTK_STATE_NORMAL]);
-#endif
}
-#if GTK_CHECK_VERSION (3, 0, 0)
static void
_xfce_heading_get_preferred_width (GtkWidget *widget,
gint *min,
@@ -295,7 +263,6 @@ _xfce_heading_draw (GtkWidget *widget,
return FALSE;
}
-#endif
@@ -336,92 +303,6 @@ _xfce_heading_size_request (GtkWidget *widget,
-#if !GTK_CHECK_VERSION (3, 0, 0)
-static void
-_xfce_heading_style_set (GtkWidget *widget,
- GtkStyle *previous_style)
-{
- /* check if we're already realized */
- if (gtk_widget_get_realized (widget))
- {
- /* set background color (using the base color) */
- gdk_window_set_background (gtk_widget_get_window (widget),
- >k_widget_get_style (widget)->base[GTK_STATE_NORMAL]);
- }
-}
-
-
-
-static gboolean
-_xfce_heading_expose_event (GtkWidget *widget,
- GdkEventExpose *event)
-{
- XfceHeading *heading = XFCE_HEADING (widget);
- PangoLayout *layout;
- GdkPixbuf *pixbuf;
- gboolean rtl;
- gint width;
- gint height;
- gint x;
- gint y;
- cairo_t *cr;
- GtkAllocation allocation;
-
- gtk_widget_get_allocation (widget, &allocation);
-
- /* check if we should render from right to left */
- rtl = (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL);
-
- /* determine the initial horizontal position */
- x = (rtl ? allocation.width - XFCE_HEADING_BORDER : XFCE_HEADING_BORDER);
-
- /* check if we have a pixbuf to render */
- pixbuf = _xfce_heading_make_pixbuf (heading);
- if (G_LIKELY (pixbuf != NULL))
- {
- /* determine the pixbuf dimensions */
- width = gdk_pixbuf_get_width (pixbuf);
- height = gdk_pixbuf_get_height (pixbuf);
-
- /* determine the vertical position */
- y = (allocation.height - height) / 2;
-
- /* render the pixbuf */
- cr = gdk_cairo_create (GDK_DRAWABLE (gtk_widget_get_window (widget)));
- gdk_cairo_set_source_pixbuf (cr, pixbuf, (rtl ? x - width : x), y);
- cairo_paint (cr);
- cairo_destroy (cr);
-
- /* release the pixbuf */
- g_object_unref (G_OBJECT (pixbuf));
-
- /* advance the horizontal position */
- x += (rtl ? -1 : 1) * (width + XFCE_HEADING_SPACING);
- }
-
- /* generate the title layout */
- layout = _xfce_heading_make_layout (heading);
- pango_layout_get_pixel_size (layout, &width, &height);
-
- /* determine the vertical position */
- y = (allocation.height - height) / 2;
-
- /* render the title */
- gtk_paint_layout (gtk_widget_get_style (widget),
- gtk_widget_get_window (widget),
- gtk_widget_get_state (widget),
- TRUE, &event->area, widget,
- "heading", (rtl ? x - width : x), y, layout);
-
- /* release the layout */
- g_object_unref (G_OBJECT (layout));
-
- return FALSE;
-}
-#endif
-
-
-
static AtkObject*
_xfce_heading_get_accessible (GtkWidget *widget)
{
diff --git a/libxfce4ui/xfce-sm-client.c b/libxfce4ui/xfce-sm-client.c
index aae05ac..ff7506b 100644
--- a/libxfce4ui/xfce-sm-client.c
+++ b/libxfce4ui/xfce-sm-client.c
@@ -1855,10 +1855,8 @@ xfce_sm_client_set_desktop_file(XfceSMClient *sm_client,
g_set_application_name(name);
}
-#if GTK_CHECK_VERSION(2, 16, 0)
if(gtk_window_get_default_icon_name())
has_default_icon = TRUE;
-#endif
icon_list = gtk_window_get_default_icon_list();
if(icon_list) {
diff --git a/libxfce4ui/xfce-spawn.c b/libxfce4ui/xfce-spawn.c
index 03bc69c..f5181df 100644
--- a/libxfce4ui/xfce-spawn.c
+++ b/libxfce4ui/xfce-spawn.c
@@ -214,13 +214,9 @@ xfce_spawn_get_active_workspace_number (GdkScreen *screen)
gint format_ret;
gint ws_num = 0;
-#if GTK_CHECK_VERSION (3, 0, 0)
GdkDisplay *display;
display = gdk_screen_get_display (screen);
gdk_x11_display_error_trap_push (display);
-#else
- gdk_error_trap_push ();
-#endif
root = gdk_screen_get_root_window (screen);
@@ -255,12 +251,7 @@ xfce_spawn_get_active_workspace_number (GdkScreen *screen)
XFree (prop_ret);
}
-#if GTK_CHECK_VERSION (3, 0, 0)
gdk_x11_display_error_trap_pop_ignored (display);
-#else
- if (gdk_error_trap_pop () != 0)
- return 0;
-#endif
return ws_num;
}
diff --git a/libxfce4ui/xfce-titled-dialog.c b/libxfce4ui/xfce-titled-dialog.c
index 3a3a8f7..15b41b9 100644
--- a/libxfce4ui/xfce-titled-dialog.c
+++ b/libxfce4ui/xfce-titled-dialog.c
@@ -140,11 +140,7 @@ xfce_titled_dialog_init (XfceTitledDialog *titled_dialog)
gtk_container_remove (GTK_CONTAINER (titled_dialog), content_area);
/* add a new vbox w/o border to the main window */
-#if GTK_CHECK_VERSION (3, 0, 0)
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-#else
- vbox = gtk_vbox_new (FALSE, 0);
-#endif
gtk_container_add (GTK_CONTAINER (titled_dialog), vbox);
gtk_widget_show (vbox);
@@ -154,11 +150,7 @@ xfce_titled_dialog_init (XfceTitledDialog *titled_dialog)
gtk_widget_show (titled_dialog->priv->heading);
/* add the separator between header and content */
-#if GTK_CHECK_VERSION (3, 0, 0)
line = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
-#else
- line = gtk_hseparator_new ();
-#endif
gtk_box_pack_start (GTK_BOX (vbox), line, FALSE, FALSE, 0);
gtk_widget_show (line);
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 28f0acc..1b3f169 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -23,7 +23,6 @@ libxfce4kbd-private/xfce-shortcuts-xfwm4.c
# Support for GtkBuilder
#
glade/libxfce4ui-glade.c
-glade/libxfce4ui.xml.in
glade/libxfce4ui-2.xml.in
#
@@ -33,6 +32,7 @@ xfce4-about/main.c
xfce4-about/contributors.h
xfce4-about/xfce4-about.desktop.in
xfce4-about/xfce4-about-dialog.glade
+xfce4-about/system-info.c
#
# UI tests
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 1d5982c..0a07e6b 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,4 +1,3 @@
glade/libxfce4ui-2.xml.in.h
-glade/libxfce4ui.xml.in.h
xfce4-about/xfce4-about-dialog.glade.h
xfce4-about/xfce4-about.desktop.in.h
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 383d8da..e2c3d11 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -25,33 +25,6 @@ noinst_PROGRAMS =
if BUILD_TESTS
-# test-ui-gtk2
-if ENABLE_GTK2_LIBRARY
-noinst_PROGRAMS += \
- test-ui-gtk2
-
-test_ui_gtk2_SOURCES = \
- test-ui.c
-
-test_ui_gtk2_CFLAGS = \
- $(LIBSM_CFLAGS) \
- $(GTK2_CFLAGS) \
- $(LIBSTARTUP_NOTIFICATION_CFLAGS) \
- $(LIBXFCE4UTIL_CFLAGS) \
- $(PLATFORM_CFLAGS)
-
-test_ui_gtk2_DEPENDENCIES = \
- $(top_builddir)/libxfce4ui/libxfce4ui-1.la
-
-test_ui_gtk2_LDADD = \
- $(LIBSM_LIBS) \
- $(GTK2_LIBS) \
- $(LIBSTARTUP_NOTIFICATION_LIBS) \
- $(LIBXFCE4UTIL_LIBS) \
- $(top_builddir)/libxfce4ui/libxfce4ui-1.la
-
-endif # ENABLE_GTK2_LIBRARY
-
# test-ui-gtk3
noinst_PROGRAMS += \
test-ui-gtk3
diff --git a/tests/test-ui.c b/tests/test-ui.c
index d8b4692..25f3d97 100644
--- a/tests/test-ui.c
+++ b/tests/test-ui.c
@@ -44,7 +44,6 @@ show_xfce_message_dialog (GtkButton *button,
{
GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file_at_size ("../icons/48x48/xfce4-logo.png", 24, 24, NULL);
-#if GTK_CHECK_VERSION (3, 0, 0)
xfce_message_dialog (NULL, "Question - Gtk3 version with no deprecated symbols",
"dialog-question",
"There are unsaved modifications",
@@ -53,22 +52,7 @@ show_xfce_message_dialog (GtkButton *button,
XFCE_BUTTON_TYPE_MIXED, "edit-delete", "Forget modifications", GTK_RESPONSE_APPLY,
XFCE_BUTTON_TYPE_PIXBUF, pixbuf, "Quit", GTK_RESPONSE_NO,
XFCE_BUTTON_TYPE_MIXED, "process-stop", "Cancel", GTK_RESPONSE_CANCEL,
- NULL);
-#endif
-
-/* ignore those warnings so it's easy to see what the default Gtk2 version
- * looks like in Gtk3 with the stock icons */
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
- xfce_message_dialog (NULL, "Question - Gtk2 version",
- GTK_STOCK_DIALOG_QUESTION,
- "There are unsaved modifications",
- "The menu has been modified, do you want to save it before quitting?",
- GTK_STOCK_SAVE, GTK_RESPONSE_YES,
- XFCE_BUTTON_TYPE_MIXED, GTK_STOCK_DELETE, "Forget modifications", GTK_RESPONSE_APPLY,
- XFCE_BUTTON_TYPE_PIXBUF, pixbuf, "Quit", GTK_RESPONSE_NO,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- NULL);
-G_GNUC_END_IGNORE_DEPRECATIONS
+ NULL);f
if (pixbuf != NULL)
{
@@ -97,21 +81,10 @@ remove_auto_online (GtkButton *button,
XfceRc *rc;
gboolean response;
-#if GTK_CHECK_VERSION (3, 0, 0)
response = xfce_dialog_confirm (NULL, "system-run", "Execute",
"Removing this will enable the show help "
"dialogs to appear. Do you want to do this?",
"Remove auto-online in rc file? (Gtk3)");
-#endif
-
-/* ignore those warnings so it's easy to see what the default Gtk2 version
- * looks like in Gtk3 with the stock icons */
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
- response = xfce_dialog_confirm (NULL, GTK_STOCK_EXECUTE, "Execute",
- "Removing this will enable the show help "
- "dialogs to appear. Do you want to do this?",
- "Remove auto-online in rc file? (Gtk2)");
-G_GNUC_END_IGNORE_DEPRECATIONS
if (response == FALSE)
return;
@@ -155,23 +128,11 @@ static void
show_xfce_dialog_confirm (GtkButton *button,
gpointer unused)
{
-#if GTK_CHECK_VERSION (3, 0, 0)
xfce_dialog_confirm (NULL, "system-run", "Execute",
"Do you want to start the panel? If you do, make sure "
"you save the session on logout, so the panel is "
"automatically started the next time you login.",
"No running instance of %s was found", G_LOG_DOMAIN);
-#endif
-
-/* ignore those warnings so it's easy to see what the default Gtk2 version
- * looks like in Gtk3 with the stock icons */
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
- xfce_dialog_confirm (NULL, GTK_STOCK_EXECUTE, "Execute",
- "Do you want to start the panel? If you do, make sure "
- "you save the session on logout, so the panel is "
- "automatically started the next time you login.",
- "No running instance of %s was found", G_LOG_DOMAIN);
-G_GNUC_END_IGNORE_DEPRECATIONS
}
@@ -187,9 +148,6 @@ static void
show_xfce_titled_dialog_new_with_buttons (GtkButton *button,
gpointer unused)
{
- GtkWidget *dialog_gtk2;
-
-#if GTK_CHECK_VERSION (3, 0, 0)
GtkWidget *dialog_gtk3;
dialog_gtk3 = xfce_titled_dialog_new_with_buttons ("Settings Editor (Gtk3)", NULL,
@@ -207,36 +165,12 @@ show_xfce_titled_dialog_new_with_buttons (GtkButton *button,
g_signal_connect (dialog_gtk3, "response", G_CALLBACK (close_window), NULL);
gtk_widget_show_all (dialog_gtk3);
-#endif
-
-/* ignore those warnings so it's easy to see what the default Gtk2 version
- * looks like in Gtk3 with the stock icons */
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
- dialog_gtk2 = xfce_titled_dialog_new_with_buttons ("Settings Editor (Gtk2)", NULL,
- GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_STOCK_HELP, GTK_RESPONSE_HELP,
- GTK_STOCK_CLOSE, GTK_RESPONSE_OK,
- NULL);
-
- xfce_titled_dialog_set_subtitle (XFCE_TITLED_DIALOG (dialog_gtk2),
- _("Customize settings stored by Xfconf"));
-
- gtk_window_set_icon_name (GTK_WINDOW (dialog_gtk2), "preferences-system");
- gtk_window_set_type_hint (GTK_WINDOW (dialog_gtk2), GDK_WINDOW_TYPE_HINT_NORMAL);
-
- g_signal_connect (dialog_gtk2, "response", G_CALLBACK (close_window), NULL);
-
- gtk_widget_show_all (dialog_gtk2);
-G_GNUC_END_IGNORE_DEPRECATIONS
}
static void
show_xfce_titled_dialog_new_with_mixed_buttons (GtkButton *button,
gpointer unused)
{
- GtkWidget *dialog_gtk2;
-
-#if GTK_CHECK_VERSION (3, 0, 0)
GtkWidget *dialog_gtk3;
dialog_gtk3 = xfce_titled_dialog_new_with_mixed_buttons ("Settings Editor (Gtk3)", NULL,
@@ -256,29 +190,7 @@ show_xfce_titled_dialog_new_with_mixed_buttons (GtkButton *button,
g_signal_connect (dialog_gtk3, "response", G_CALLBACK (close_window), NULL);
gtk_widget_show_all (dialog_gtk3);
-#endif
-/* ignore those warnings so it's easy to see what the default Gtk2 version
- * looks like in Gtk3 with the stock icons */
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
- dialog_gtk2 = xfce_titled_dialog_new_with_mixed_buttons ("Settings Editor (Gtk2)", NULL,
- GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_STOCK_HELP, "Help", GTK_RESPONSE_HELP,
- GTK_STOCK_CLOSE, "Close", GTK_RESPONSE_OK,
- "weather-snow", "Snow?", GTK_RESPONSE_APPLY,
- "", "no icon", GTK_RESPONSE_CANCEL,
- NULL);
-
- xfce_titled_dialog_set_subtitle (XFCE_TITLED_DIALOG (dialog_gtk2),
- _("Customize settings stored by Xfconf"));
-
- gtk_window_set_icon_name (GTK_WINDOW (dialog_gtk2), "preferences-system");
- gtk_window_set_type_hint (GTK_WINDOW (dialog_gtk2), GDK_WINDOW_TYPE_HINT_NORMAL);
-
- g_signal_connect (dialog_gtk2, "response", G_CALLBACK (close_window), NULL);
-
- gtk_widget_show_all (dialog_gtk2);
-G_GNUC_END_IGNORE_DEPRECATIONS
}
static void
@@ -290,8 +202,8 @@ show_xfce_gdk_screen_get_active (GtkButton *button,
screen = xfce_gdk_screen_get_active (&monitor_num);
- xfce_dialog_show_info(NULL, NULL, "monitor num: %d of %d",
- monitor_num, gdk_screen_get_n_monitors (screen));
+ xfce_dialog_show_info (NULL, NULL, "monitor num: %d of %d",
+ monitor_num, gdk_screen_get_n_monitors (screen));
}
@@ -314,11 +226,7 @@ create_main_window (void)
g_signal_connect (G_OBJECT (window), "destroy", G_CALLBACK (main_window_destroy), NULL);
/* Create the box to hold all the stuff */
-#if GTK_CHECK_VERSION (3, 0, 0)
box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
-#else
- box = gtk_vbox_new (FALSE, 0);
-#endif
gtk_container_add (GTK_CONTAINER (window), box);
gtk_widget_show (box);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list