Index: configure.in.in =================================================================== --- configure.in.in (revision 26966) +++ configure.in.in (working copy) @@ -125,11 +125,6 @@ dnl *********************************** dnl *** Check for optional packages *** dnl *********************************** -XDT_CHECK_OPTIONAL_PACKAGE([XFCE_MCS_MANAGER], - [xfce-mcs-manager], - [4.4.0], [mcs-plugin], - [xfce-mcs-manager], [yes]) - XDT_CHECK_OPTIONAL_PACKAGE([LIBSTARTUP_NOTIFICATION], [libstartup-notification-1.0], [0.5], [startup-notification], @@ -277,7 +272,6 @@ plugins/systray/Makefile plugins/tasklist/Makefile plugins/windowlist/Makefile -mcs-plugin/Makefile po/Makefile.in docs/Makefile docs/API/Makefile @@ -298,11 +292,6 @@ else echo "* Startup Notification: no" fi -if test x"$XFCE_MCS_MANAGER_FOUND" = x"yes"; then -echo "* Xfce Settings Manager plugin: yes" -else -echo "* Xfce Settings Manager plugin: no" -fi echo "* Debugging Support: $enable_debug" echo "* Dummy Scripts: $enable_dummy_scripts" echo Index: Makefile.am =================================================================== --- Makefile.am (revision 26966) +++ Makefile.am (working copy) @@ -6,7 +6,6 @@ libxfce4panel \ panel \ plugins \ - mcs-plugin \ po \ docs @@ -20,7 +19,21 @@ html: make -C docs html +# +# .desktop file +# +desktopdir = $(datadir)/applications +desktop_in_files = \ + xfce4-panel-manager.desktop.in +desktop_DATA = \ + $(desktop_in_files:.desktop.in=.desktop) +@INTLTOOL_DESKTOP_RULE@ + +CLEANFILES = \ + $(desktop_DATA) + EXTRA_DIST = \ + $(desktop_in_files) \ README \ COPYING \ COPYING.LIB \ Index: mcs-plugin/plugin.c =================================================================== --- mcs-plugin/plugin.c (revision 26966) +++ mcs-plugin/plugin.c (working copy) @@ -1,75 +0,0 @@ -/* $Id$ - * - * Copyright (c) 2006 Jasper Huijsmans - * Copyright (c) 2006 Nick Schermer - * - * 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 -#endif - -#include -#include - -static void -run_dialog (McsPlugin *plugin) -{ - GtkWidget *message; - GError *error = NULL; - gchar *argv[] = { BINDIR G_DIR_SEPARATOR_S "xfce4-panel", "-c", NULL }; - - if (!g_spawn_async (NULL, argv, NULL, 0, NULL, NULL, NULL, &error)) - { - message = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, - "%s.", _("Failed to launch 'xfce4-panel -c'")); - gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (message), "%s.", error->message); - gtk_dialog_run (GTK_DIALOG (message)); - gtk_widget_destroy (message); - g_error_free (error); - } -} - -McsPluginInitResult -mcs_plugin_init (McsPlugin *plugin) -{ - GtkIconTheme *icon_theme; - - /* setup i18n support */ - xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8"); - - /* initialize plugin structure */ - plugin->plugin_name = g_strdup ("xfce4panel"); - plugin->caption = g_strdup (_("Panel")); - plugin->run_dialog = run_dialog; - - /* lookup the icon (on the default icon theme, *sigh*) */ - icon_theme = gtk_icon_theme_get_default (); - plugin->icon = gtk_icon_theme_load_icon (icon_theme, "xfce4-panel", 48, 0, NULL); - - /* if that didn't work, we know where we installed the icon, so load it directly */ - if (G_UNLIKELY (plugin->icon == NULL)) - plugin->icon = gdk_pixbuf_new_from_file (DATADIR "/icons/hicolor/48x48/apps/xfce4-panel.png", NULL); - - /* attach icon name to the plugin icon (if any) */ - if (G_LIKELY (plugin->icon != NULL)) - g_object_set_data_full (G_OBJECT (plugin->icon), "mcs-plugin-icon-name", g_strdup ("xfce4-panel"), g_free); - - return MCS_PLUGIN_INIT_OK; -} - -MCS_PLUGIN_CHECK_INIT; Index: mcs-plugin/Makefile.am =================================================================== --- mcs-plugin/Makefile.am (revision 26966) +++ mcs-plugin/Makefile.am (working copy) @@ -1,43 +1,4 @@ -# $Id$ - -INCLUDES = \ - -I$(top_srcdir) \ - -DBINDIR=\"$(bindir)\" \ - -DDATADIR=\"$(datadir)\" \ - -DG_LOG_DOMAIN=\"panel-mcs-plugin\" \ - -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \ - $(PLATFORM_CPPFLAGS) - # -# build mcs wrapper plugin if xfce-mcs-manager is present. -# -if HAVE_XFCE_MCS_MANAGER -plugindir = \ - $(libdir)/xfce4/mcs-plugins - -plugin_LTLIBRARIES = \ - libxfce4settings.la - -libxfce4settings_la_SOURCES = \ - plugin.c - -libxfce4settings_la_CFLAGS = \ - $(LIBXFCEGUI4_CFLAGS) \ - $(XFCE_MCS_MANAGER_CFLAGS) \ - $(PLATFORM_CFLAGS) - -libxfce4settings_la_LDFLAGS = \ - -avoid-version \ - -no-undefined \ - -module \ - $(PLATFORM_LDFLAGS) - -libxfce4settings_la_LIBADD = \ - $(LIBXFCEGUI4_LIBS) \ - $(XFCE_MCS_MANAGER_LIBS) -endif - -# # .desktop file # desktopdir = $(datadir)/applications Index: mcs-plugin/xfce4-panel-manager.desktop.in =================================================================== --- mcs-plugin/xfce4-panel-manager.desktop.in (revision 26966) +++ mcs-plugin/xfce4-panel-manager.desktop.in (working copy) @@ -9,4 +9,3 @@ Terminal=false Categories=X-XFCE;Settings;DesktopSettings; OnlyShowIn=XFCE; -