[Xfce4-commits] r27043 - in xfcalendar/trunk: . plugin

[Juha Kautto]

Author: juha
Date: 2008-06-08 20:07:39 +0000 (Sun, 08 Jun 2008)
New Revision: 27043

Removed:
   xfcalendar/trunk/plugin/xfcalendar_plugin.c
Modified:
   xfcalendar/trunk/configure.in.in
   xfcalendar/trunk/plugin/Makefile.am
   xfcalendar/trunk/plugin/xfce-xfcalendar-settings.desktop.in
Log:
applied fix for Bug 4074 - Remove mcs-dependency
Thanks to Stephan Arts, who created this patch


Modified: xfcalendar/trunk/configure.in.in
===================================================================
--- xfcalendar/trunk/configure.in.in	2008-06-08 08:50:03 UTC (rev 27042)
+++ xfcalendar/trunk/configure.in.in	2008-06-08 20:07:39 UTC (rev 27043)
@@ -9,7 +9,7 @@
 dnl
 
 dnl Version information
-m4_define([orage_version], [4.5.13.8-svn])
+m4_define([orage_version], [4.5.13.9-svn])
 
 m4_define([gtk_minimum_version], [2.6.0])
 m4_define([xfce_minimum_version], [4.4.0])
@@ -74,15 +74,11 @@
 XDT_I18N([@LINGUAS@])
 
 dnl Check for required packages
-XDT_CHECK_PACKAGE([LIBXFCE4MCS_CLIENT], [libxfce4mcs-client-1.0], [xfce_minimum_version])
 XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [xfce_minimum_version])
 
 dnl Needed for panel plugin
 XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [xfce_minimum_version])
 
-dnl configure the mcs plugin
-XDT_XFCE_MCS_PLUGIN([XFCE_MCS_MANAGER], [xfce_minimum_version])
-
 dnl the ical magic
 ac_INCLUDED_LIBICAL=yes
  

Modified: xfcalendar/trunk/plugin/Makefile.am
===================================================================
--- xfcalendar/trunk/plugin/Makefile.am	2008-06-08 08:50:03 UTC (rev 27042)
+++ xfcalendar/trunk/plugin/Makefile.am	2008-06-08 20:07:39 UTC (rev 27043)
@@ -1,22 +1,3 @@
-orage_plugindir = 							\
-	$(libdir)/xfce4/mcs-plugins
-
-orage_plugin_LTLIBRARIES = orage_plugin.la
-
-orage_plugin_la_LDFLAGS =					\
-	-avoid-version							\
-	-module
-
-orage_plugin_la_SOURCES =					\
-	xfcalendar_plugin.c
-
-orage_plugin_la_CFLAGS = 					\
-	$(XFCE_MCS_MANAGER_CFLAGS) 				\
-	-DBINDIR=\"$(bindir)\"	\
-	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"	\
-	-DSYSCONFDIR=\"$(sysconfdir)\"			\
-	-DDATADIR=\"$(pkgdatadir)\" 
-
 desktopdir = $(datadir)/applications
 desktop_in_files = xfce-xfcalendar-settings.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)

Deleted: xfcalendar/trunk/plugin/xfcalendar_plugin.c

Modified: xfcalendar/trunk/plugin/xfce-xfcalendar-settings.desktop.in
===================================================================
--- xfcalendar/trunk/plugin/xfce-xfcalendar-settings.desktop.in	2008-06-08 08:50:03 UTC (rev 27042)
+++ xfcalendar/trunk/plugin/xfce-xfcalendar-settings.desktop.in	2008-06-08 20:07:39 UTC (rev 27043)
@@ -3,7 +3,7 @@
 Encoding=UTF-8
 _Name=Xfce 4 Calendar Settings
 _Comment=Settings for the Xfce 4 Calendar Application
-Exec=xfce-setting-show orage
+Exec=orage -p
 Icon=xfcalendar
 Terminal=false
 Type=Application