[Xfce4-commits] <xfdesktop:danielm/port-to-gio> * Dropping File JOBS, we'll use Thunar D-BUS API * Removed gUDEV build checks.
Jannis Pohlmann
noreply at xfce.org
Sun Aug 29 21:14:09 CEST 2010
Updating branch refs/heads/danielm/port-to-gio
to a22f545060cbd1169f93129b8e115b0f4abb4aea (commit)
from e69bb9e3d5a991dc417443f3835515a951c2cb94 (commit)
commit a22f545060cbd1169f93129b8e115b0f4abb4aea
Author: Daniel Morales <daniel at daniel.com.uy>
Date: Tue Feb 23 19:42:09 2010 -0200
* Dropping File JOBS, we'll use Thunar D-BUS API
* Removed gUDEV build checks.
configure.ac.in | 66 ++++--------------------------------------
src/Makefile.am | 17 +----------
src/xfdesktop-file-jobs.c | 55 -----------------------------------
src/xfdesktop-file-jobs.h | 42 ---------------------------
src/xfdesktop-job.c | 70 ---------------------------------------------
src/xfdesktop-job.h | 69 --------------------------------------------
6 files changed, 7 insertions(+), 312 deletions(-)
diff --git a/configure.ac.in b/configure.ac.in
index 714bdf4..1a569b4 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -25,7 +25,6 @@ m4_define([dbus_minimum_version], [0.34])
m4_define([wnck_minimum_version], [2.12])
m4_define([intltool_minimum_version], [0.31])
m4_define([xfconf_minimum_version], [4.6.0])
-m4_define([gudev_minimum_version], [145])
dnl init autoconf
AC_INIT([xfdesktop], [xfdesktop_version], [http://bugzilla.xfce.org/])
@@ -106,15 +105,6 @@ else
fi
if test "x$enable_desktop_icons" = "xyes" -a "x$enable_file_icons" = "xyes"; then
- dnl here i shall abuse the XDT_CHECK_PACKAGE macro
- XDT_CHECK_PACKAGE([LIBEXO], [exo-1],
- [exo_minimum_version], [], [
-echo "*** Optional package exo-1 was either not found on your system"
-echo "*** or is too old. Please install or upgrade to at least version"
-echo "*** thunar_minimum_version, or adjust the PKG_CONFIG_PATH environment variable"
-echo "*** if you installed the new version of the package in a nonstandard"
-echo "*** prefix. File/launcher icons will be disabled."
-])
XDT_CHECK_PACKAGE([DBUS], [dbus-glib-1], [dbus_minimum_version], [], [
echo "*** Optional package dbus-glib-1 was either not found on your system"
echo "*** or is too old. Please install or upgrade to at least version"
@@ -123,50 +113,15 @@ echo "*** if you installed the new version of the package in a nonstandard"
echo "*** prefix. File/launcher icons will be disabled."
])
enable_file_icons="no"
- if test "x$LIBEXO_VERSION" != "x"; then
- already_have_libexo="yes"
-
- if test "x$DBUS_VERSION" != "x"; then
- enable_file_icons="yes"
- AC_DEFINE([ENABLE_FILE_ICONS], [1],
- [Define if file icons should be enabled])
- fi
+ if test "x$DBUS_VERSION" != "x"; then
+ enable_file_icons="yes"
+ AC_DEFINE([ENABLE_FILE_ICONS], [1],
+ [Define if file icons should be enabled])
fi
fi
AM_CONDITIONAL([ENABLE_FILE_ICONS], [test "x$enable_file_icons" = "xyes"])
-dnl if we want desktop icons, do we also want volume monitoring?
-AC_ARG_ENABLE([volume-monitoring],
- [AC_HELP_STRING([--disable-volume-monitoring],
- [Do not compile in support for Volume monitoring (default=enabled)])],
- [ac_cv_enable_volume_monitoring=$enableval],
- [ac_cv_enable_volume_monitoring=yes])
-if test "x$ac_cv_enable_volume_monitoring" = "xno" -o "x$enable_desktop_icons" != "xyes"; then
- enable_volume_monitoring="no"
-else
- enable_volume_monitoring="yes"
-fi
-
-if test "x$enable_desktop_icons" = "xyes" -a "x$enable_volume_monitoring" = "xyes"; then
- XDT_CHECK_PACKAGE([GUDEV], [gudev-1.0],
- [gudev_minimum_version], [], [
-echo "*** Optional package gudev-1.0 was either not found on your system"
-echo "*** or is too old. Please install or upgrade to at least version"
-echo "*** thunar_minimum_version, or adjust the PKG_CONFIG_PATH environment variable"
-echo "*** if you installed the new version of the package in a nonstandard"
-echo "*** prefix. Volume monitoring will be disabled."
-])
- enable_volume_monitoring="no"
- if test "x$GUDEV_VERSION" != "x"; then
- enable_volume_monitoring="yes"
- AC_DEFINE([ENABLE_VOLUME_MONITORING], [1],
- [Define if volume monitoring should be enabled])
- fi
-fi
-
-AM_CONDITIONAL([ENABLE_VOLUME_MONITORING], [test "x$enable_volume_monitoring" = "xyes"])
-
dnl i'd rather have these two only checked conditionally, but this macro also
dnl calls AM_CONDITIONAL(), which cannot be in an 'if' block
@@ -174,16 +129,8 @@ XDT_CHECK_OPTIONAL_PACKAGE([THUNARX], [thunarx-2], [thunar_minimum_version],
[thunarx],
[Thunar's extension mechanism, to add external features to the desktop icon implementation])
-dnl maybe we already have it from file icons
-if test "x$already_have_libexo" != "xyes"; then
- XDT_CHECK_PACKAGE([LIB], [exo-1], [exo_minimum_version], [], [
-echo "*** Optional package exo-1 was either not found on your system"
-echo "*** or is too old. Please install or upgrade to at least version"
-echo "*** dbus_minimum_version, or adjust the PKG_CONFIG_PATH environment variable"
-echo "*** if you installed the new version of the package in a nonstandard"
-echo "*** prefix. Nifty icon effects will be disabled."
-])
-fi
+XDT_CHECK_OPTIONAL_PACKAGE([LIBEXO], [exo-1], [exo_minimum_version], [exo],
+ [libexo, for nifty icon effects])
AC_ARG_ENABLE([desktop-menu],
AC_HELP_STRING([--disable-desktop-menu],
@@ -279,5 +226,4 @@ fi
echo " Build desktop menu module: $build_desktop_menu"
echo " Build support for desktop icons: $enable_desktop_icons"
echo " Include support for file/launcher icons: $enable_file_icons"
-echo " Enable volume monitoring: $enable_volume_monitoring"
echo
diff --git a/src/Makefile.am b/src/Makefile.am
index 72d1159..d61dedf 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -51,11 +51,7 @@ desktop_file_icon_sources = \
xfdesktop-special-file-icon.c \
xfdesktop-special-file-icon.h \
xfdesktop-volume-icon.c \
- xfdesktop-volume-icon.h \
- xfdesktop-job.c \
- xfdesktop-job.h \
- xfdesktop-file-jobs.c \
- xfdesktop-file-jobs.h
+ xfdesktop-volume-icon.h
xfdesktop_CFLAGS = \
-I$(top_srcdir) \
@@ -127,17 +123,6 @@ xfdesktop_LDADD += \
$(DBUS_LIBS)
endif
-
-if ENABLE_VOLUME_MONITORING
-
-xfdesktop_CFLAGS += \
- -DG_UDEV_API_IS_SUBJECT_TO_CHANGE \
- $(GUDEV_CFLAGS)
-
-xfdesktop_LDADD += \
- $(GUDEV_LIBS)
-
-endif
endif
if MAINTAINER_MODE
diff --git a/src/xfdesktop-file-jobs.c b/src/xfdesktop-file-jobs.c
deleted file mode 100644
index 129f349..0000000
--- a/src/xfdesktop-file-jobs.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*-
- * Copyright (c) 2010 Daniel Morales <daniel at daniel.com.uy>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program 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
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gio/gio.h>
-
-#include "xfdesktop-job.h"
-#include "xfdesktop-file-jobs.h"
-
-XfdesktopJob *
-xfdesktop_file_jobs_link_file(GFile *src,
- GFile *dest)
-{
- return NULL;
-}
-
-XfdesktopJob *
-xfdesktop_file_jobs_move_file(GFile *src,
- GFile *dest)
-{
- return NULL;
-}
-
-XfdesktopJob *
-xfdesktop_file_jobs_copy_file(GFile *src,
- GFile *dest)
-{
- return NULL;
-}
-
-XfdesktopJob *
-xfdesktop_file_jobs_unlink_file(GFile *src)
-{
- return NULL;
-}
-
diff --git a/src/xfdesktop-file-jobs.h b/src/xfdesktop-file-jobs.h
deleted file mode 100644
index b3cf81a..0000000
--- a/src/xfdesktop-file-jobs.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*-
- * Copyright (c) 2010 Daniel Morales <daniel at daniel.com.uy>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program 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
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef __XDESKTOP_FILE_JOBS_H__
-#define __XDESKTOP_FILE_JOBS_H__
-
-#include <gio/gio.h>
-
-#include "xfdesktop-job.h"
-
-G_BEGIN_DECLS
-
-XfdesktopJob *xfdesktop_file_jobs_link_file(GFile *src,
- GFile *dest);
-
-XfdesktopJob *xfdesktop_file_jobs_move_file(GFile *src,
- GFile *dest);
-
-XfdesktopJob *xfdesktop_file_jobs_copy_file(GFile *src,
- GFile *dest);
-
-XfdesktopJob *xfdesktop_file_jobs_unlink_file(GFile *src);
-
-G_END_DECLS
-
-#endif /* !__XDESKTOP_IO_JOBS_H__ */
diff --git a/src/xfdesktop-job.c b/src/xfdesktop-job.c
deleted file mode 100644
index b12c67c..0000000
--- a/src/xfdesktop-job.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*-
- * Copyright (c) 2010 Daniel Morales <daniel at daniel.com.uy>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program 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
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <exo/exo.h>
-
-#include "xfdesktop-job.h"
-
-#define XFDESKTOP_JOB_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), XFDESKTOP_TYPE_JOB, XfdesktopJobPrivate))
-
-static void xfdesktop_job_finalize (GObject *object);
-
-struct _XfdesktopJobPrivate
-{
- /* Private */
-};
-
-G_DEFINE_ABSTRACT_TYPE (XfdesktopJob, xfdesktop_job, EXO_TYPE_JOB)
-
-static void
-xfdesktop_job_class_init (XfdesktopJobClass *klass)
-{
- GObjectClass *gobject_class;
-
- /* Private data */
- g_type_class_add_private (klass, sizeof (XfdesktopJobPrivate));
-
- gobject_class = G_OBJECT_CLASS (klass);
- gobject_class->finalize = xfdesktop_job_finalize;
-}
-
-static void
-xfdesktop_job_init (XfdesktopJob *job)
-{
- job->priv = XFDESKTOP_JOB_GET_PRIVATE (job);
-
- /* Init stuff.. */
-}
-
-static void
-xfdesktop_job_finalize (GObject *object)
-{
- (*G_OBJECT_CLASS (xfdesktop_job_parent_class)->finalize) (object);
-}
-
-void
-xfdesktop_job_cancel (XfdesktopJob *job)
-{
- exo_job_cancel (EXO_JOB (job));
-}
-
diff --git a/src/xfdesktop-job.h b/src/xfdesktop-job.h
deleted file mode 100644
index fde72af..0000000
--- a/src/xfdesktop-job.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*-
- * Copyright (c) 2010 Daniel Morales <daniel at daniel.com.uy>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program 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
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef __XFDESKTOP_JOB_H__
-#define __XFDESKTOP_JOB_H__
-
-#include <exo/exo.h>
-
-G_BEGIN_DECLS
-
-typedef enum
-{
- XFDESKTOP_JOB_RESPONSE_YES = 1 << 0,
- XFDESKTOP_JOB_RESPONSE_YES_ALL = 1 << 1,
- XFDESKTOP_JOB_RESPONSE_NO = 1 << 2,
- XFDESKTOP_JOB_RESPONSE_CANCEL = 1 << 3,
-} XfdesktopJobResponse;
-
-typedef struct _XfdesktopJobPrivate XfdesktopJobPrivate;
-typedef struct _XfdesktopJobClass XfdesktopJobClass;
-typedef struct _XfdesktopJob XfdesktopJob;
-
-#define XFDESKTOP_TYPE_JOB (xfdesktop_job_get_type ())
-#define XFDESKTOP_JOB(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), XFDESKTOP_TYPE_JOB, XfdesktopJob))
-#define XFDESKTOP_JOB_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), XFDESKTOP_TYPE_JOB, XfdesktopJobClass))
-#define XFDESKTOP_IS_JOB(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), XFDESKTOP_TYPE_JOB))
-#define XFDESKTOP_IS_JOB_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), XFDESKTOP_TYPE_JOB))
-#define XFDESKTOP_JOB_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), XFDESKTOP_TYPE_JOB, XfdesktopJobClass))
-
-struct _XfdesktopJobClass
-{
- /* Private */
- ExoJobClass __parent__;
-
- /* Public */
-
- /* Signals */
-};
-
-struct _XfdesktopJob
-{
- /* Private */
- ExoJob __parent__;
- XfdesktopJobPrivate *priv;
-};
-
-GType xfdesktop_job_get_type(void) G_GNUC_CONST;
-
-void xfdesktop_job_cancel(XfdesktopJob *job);
-
-G_END_DECLS
-
-#endif /* !__XFDESKTOP_JOB_H__ */
More information about the Xfce4-commits
mailing list