[Xfce4-commits] [panel-plugins/xfce4-verve-plugin] 01/02: Remove verve-focus and libdbus-glib-1 support in preparation for move to GTK3

noreply at xfce.org noreply at xfce.org
Sun Jul 3 23:35:54 CEST 2016


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

isaacschemm pushed a commit to branch isaacschemm/gtk3
in repository panel-plugins/xfce4-verve-plugin.

commit 2c3105f08c3e4daeff3376e4d2ea316f20effef2
Author: Isaac Schemm <isaacschemm at gmail.com>
Date:   Sun Jul 3 16:11:17 2016 -0500

    Remove verve-focus and libdbus-glib-1 support in preparation for move to GTK3
---
 Makefile.am              |   1 -
 README                   |   1 -
 configure.ac.in          |  15 -------
 panel-plugin/Makefile.am |  25 ------------
 scripts/Makefile.am      |  20 ---------
 scripts/verve-focus.c    | 103 -----------------------------------------------
 6 files changed, 165 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index e588a53..a6c90af 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,6 @@
 
 SUBDIRS =								\
 	panel-plugin							\
-	scripts								\
 	po
 
 AUTOMAKE_OPTIONS =							\
diff --git a/README b/README
index f7e03d0..f0dc339 100644
--- a/README
+++ b/README
@@ -9,7 +9,6 @@ Required packages:
   * libpcre
 
 Optional packages:
-  * dbus (for the verve-focus command)
   * wordexp (for tilde and variable expansion in directory paths)
 
 Build tools required:
diff --git a/configure.ac.in b/configure.ac.in
index af7f69d..f70e2ce 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -60,20 +60,6 @@ XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.8.0])
 XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.6.4])
 XDT_CHECK_PACKAGE([LIBPCRE], [libpcre], [5.0])
 
-dnl *********************************
-dnl ** Optional support for D-BUS ***
-dnl *********************************
-XDT_CHECK_OPTIONAL_PACKAGE([DBUS], [dbus-glib-1],
-                           [0.34], [dbus], [D-BUS support])
-
-dnl *******************************************************
-dnl ** Determine if D-BUS version is >= 0.60 in order to **
-dnl ** set correct flags when calling D-BUS functions    **
-dnl *******************************************************
-if $PKG_CONFIG --atleast-version=0.60 dbus-glib-1 >/dev/null 2>&1; then
-  AC_DEFINE([HAVE_DBUS_NEW_FLAGS], [1], [Define if D-BUS version >= 0.60])
-fi
-
 dnl *******************************************************
 dnl ** Determine if wordexp is available for expanding   **
 dnl ** pathnames entered into the verve input box        **
@@ -88,6 +74,5 @@ XDT_FEATURE_DEBUG()
 AC_OUTPUT([
 Makefile
 panel-plugin/Makefile
-scripts/Makefile
 po/Makefile.in
 ])
diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index 2ce10ec..55067ef 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -37,26 +37,6 @@ libverve_la_LDFLAGS = \
 	-export-symbols-regex '^xfce_panel_module_(preinit|init|construct)' \
 	$(PLATFORM_LDFLAGS)
 
-if HAVE_DBUS
-libverve_la_SOURCES += 							\
-	verve-dbus-service-infos.h					\
-	verve-dbus-service.h						\
-	verve-dbus-service.c						
-
-libverve_la_CFLAGS +=							\
-	-DDBUS_API_SUBJECT_TO_CHANGE					\
-	$(DBUS_CFLAGS)
-
-libverve_la_LIBADD += 							\
-	$(DBUS_LIBS)
-
-verve-dbus-service-infos.h: Makefile $(srcdir)/verve-dbus-service-infos.xml 
-	dbus-binding-tool --prefix=verve_dbus_service --mode=glib-server $(srcdir)/verve-dbus-service-infos.xml > verve-dbus-service-infos.h
-
-BUILT_SOURCES = 							\
-	verve-dbus-service-infos.h
-endif
-
 # .desktop file
 #
 # We need to let intltool merge the translated fields, so we add a
@@ -73,9 +53,4 @@ EXTRA_DIST = 								\
  
 DISTCLEANFILES = $(desktop_DATA)
 
-if HAVE_DBUS
-DISTCLEANFILES +=							\
-	verve-dbus-service-infos.h
-endif
-
 # vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
deleted file mode 100644
index 0be767b..0000000
--- a/scripts/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-if HAVE_DBUS
-
-bin_PROGRAMS = verve-focus
-
-verve_focus_SOURCES = 							\
-	verve-focus.c
-
-verve_focus_CFLAGS = 							\
-	-DDBUS_API_SUBJECT_TO_CHANGE					\
-	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"				\
-	@DBUS_CFLAGS@							\
-	@LIBXFCE4UTIL_CFLAGS@						
-
-verve_focus_LDADD = 							\
-	@DBUS_LIBS@							\
-	@LIBXFCE4UTIL_LIBS@
-
-endif
-
-# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/scripts/verve-focus.c b/scripts/verve-focus.c
deleted file mode 100644
index 8a5ba22..0000000
--- a/scripts/verve-focus.c
+++ /dev/null
@@ -1,103 +0,0 @@
-/* vi:set expandtab sw=2 sts=2: */
-/*-
- * Copyright (c) 2006-2007 Jannis Pohlmann <jannis at xfce.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-
-#include <libxfce4util/libxfce4util.h>
-
-#include <glib.h>
-
-#include <dbus/dbus.h>
-
-
-
-int 
-main (int     argc,
-      gchar **argv)
-{
-  DBusConnection *connection;
-  DBusMessage    *method;
-  DBusMessage    *result;
-  DBusError       error;
-  gint            exit_status;
-
-  /* Configure gettext */
-  xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8");
-
-  /* Initialize error structure */
-  dbus_error_init (&error);
-
-  /* Connect to the session bus */
-  connection = dbus_bus_get (DBUS_BUS_SESSION, &error);
-
-  /* Print error if connection failed */
-  if (G_UNLIKELY (connection == NULL))
-    {
-      /* Print error message */
-      g_error (_("Failed to connect to the D-BUS session bus."));
-
-      /* Free error structure */
-      dbus_error_free (&error);
-
-      /* Exit with error code */
-      return EXIT_FAILURE;
-    }
-
-  /* Generate D-BUS message */
-  method = dbus_message_new_method_call ("org.xfce.Verve", "/org/xfce/RunDialog", "org.xfce.Verve", "GrabFocus");
-
-  /* Send message and wait for reply */
-  result = dbus_connection_send_with_reply_and_block (connection, method, 5000, &error);
-
-  /* Destroy sent message */
-  if (G_LIKELY (method != NULL))
-    dbus_message_unref (method);
-
-  /* Handle method send error */
-  if (G_UNLIKELY (result == NULL))
-    {
-      /* Print error message */
-      g_debug (_("There seems to be no Verve D-BUS provider (e.g. the Verve panel plugin) running."));
-
-      /* Free error structure */
-      dbus_error_free (&error);
-
-      /* Set exit status */
-      exit_status = EXIT_FAILURE;
-    }
-  else
-    exit_status = EXIT_SUCCESS;
-
-  /* Destroy result */
-  if (G_LIKELY (result != NULL))
-    dbus_message_unref (result);
-
-  /* Disconnect from session bus */
-  if (G_LIKELY (connection != NULL))
-    dbus_connection_unref (connection);
-
-  return exit_status;
-}

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


More information about the Xfce4-commits mailing list