[Xfce4-commits] <xfce4-session:master> Remove the xfce4-panel logout menu plugin.

Nick Schermer noreply at xfce.org
Sun Oct 23 18:48:01 CEST 2011


Updating branch refs/heads/master
         to 539589ad6d106ff94e6b4ca6a2008a150ded6eb5 (commit)
       from 1a965d018a46c7e58cc2016f669e28e6ab623976 (commit)

commit 539589ad6d106ff94e6b4ca6a2008a150ded6eb5
Author: Nick Schermer <nick at xfce.org>
Date:   Sun Oct 23 18:37:43 2011 +0200

    Remove the xfce4-panel logout menu plugin.
    
    Functionality of this plugin has been integrated in the
    actions plugin of xfce4-panel.

 Makefile.am                                |    9 +-
 configure.in.in                            |   11 -
 panel-plugin/Makefile.am                   |   66 -----
 panel-plugin/xfsm-logout-plugin-ui.xml     |   15 -
 panel-plugin/xfsm-logout-plugin.c          |  420 ----------------------------
 panel-plugin/xfsm-logout-plugin.desktop.in |    7 -
 po/POTFILES.in                             |    2 -
 7 files changed, 1 insertions(+), 529 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index a7334e4..c505274 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
 SUBDIRS =								\
 	libxfsm								\
 	doc								\
@@ -10,12 +8,7 @@ SUBDIRS =								\
 	scripts								\
 	xfce4-session							\
 	xfce4-session-logout						\
-	xfsm-shutdown-helper						\
-	$(panel_plugin_dir)
-
-if HAVE_LIBXFCE4PANEL
-panel_plugin_dir = panel-plugin
-endif
+	xfsm-shutdown-helper
 
 desktopdir = $(XSESSION_PREFIX)/share/xsessions
 desktop_in_files = xfce.desktop.in
diff --git a/configure.in.in b/configure.in.in
index 8eff947..1d10454 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -91,10 +91,6 @@ XDT_CHECK_PACKAGE([DBUS], [dbus-1], [1.0.0])
 XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [0.73])
 XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.8.0])
 
-dnl we provide a panel plugin now
-XDT_CHECK_OPTIONAL_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.8.0],
-                           [panel-plugin], [Panel logout menu button], [yes])
-
 dnl Check for gnome support
 XDT_CHECK_OPTIONAL_PACKAGE([GNOME_KEYRING], [gnome-keyring-1], [2.22],
                            [libgnome-keyring],
@@ -284,7 +280,6 @@ icons/128x128/Makefile
 icons/scalable/Makefile
 libxfsm/Makefile
 libxfsm/xfce4-session-2.0.pc
-panel-plugin/Makefile
 po/Makefile.in
 settings/Makefile
 scripts/Makefile
@@ -328,12 +323,6 @@ echo " * Legacy session management:      yes"
 else
 echo " * Legacy session management:      no"
 fi
-if test x"$LIBXFCE4PANEL_FOUND" = x"yes"; then
-echo " * Panel plugin:                   yes"
-else
-echo " * Panel plugin:                   no"
-fi
-echo
 if test x"$GNOME_KEYRING_FOUND" = x"yes"; then
 echo " * Gnome Keyring support:          yes"
 else
diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
deleted file mode 100644
index 0675e2e..0000000
--- a/panel-plugin/Makefile.am
+++ /dev/null
@@ -1,66 +0,0 @@
-
-INCLUDES = \
-	-I$(top_srcdir) \
-	-DLOCALEDIR=\"$(localedir)\" \
-	-DG_LOG_DOMAIN=\"libxfsm-logout-plugin\"
-
-plugindir = $(libdir)/xfce4/panel/plugins
-
-plugin_LTLIBRARIES = libxfsm-logout-plugin.la
-
-libxfsm_logout_plugin_built_sources = \
-	xfsm-logout-plugin-ui.h
-
-libxfsm_logout_plugin_la_SOURCES = \
-	$(libxfsm_logout_plugin_built_sources) \
-	xfsm-logout-plugin.c
-
-libxfsm_logout_plugin_la_CFLAGS = \
-	$(LIBX11_CFLAGS) \
-	$(LIBXFCE4PANEL_CFLAGS) \
-	$(LIBXFCE4UTIL_CFLAGS) \
-	$(LIBXFCE4UI_CFLAGS) \
-	$(GTK_CFLAGS) \
-	$(DBUS_GLIB_CFLAGS)
-
-libxfsm_logout_plugin_la_LIBADD = \
-	$(LIBX11_LIBS) \
-	$(LIBXFCE4PANEL_LIBS) \
-	$(LIBXFCE4UTIL_LIBS) \
-	$(LIBXFCE4UI_LIBS) \
-	$(GTK_LIBS) \
-	$(DBUS_GLIB_LIBS)
-
-libxfsm_logout_plugin_la_LDFLAGS = \
-	-avoid-version \
-	-module \
-	-no-undefined \
-	-export-symbols-regex '^xfce_panel_module_(preinit|init|construct)'
-
-#
-# .desktop file
-#
-desktopdir = $(datadir)/xfce4/panel-plugins
-desktop_in_files = xfsm-logout-plugin.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
- at INTLTOOL_DESKTOP_RULE@
-
-EXTRA_DIST = \
-	xfsm-logout-plugin-ui.xml \
-	$(desktop_in_files)
-
-DISTCLEANFILES = \
-	$(desktop_DATA)
-
-if MAINTAINER_MODE
-BUILT_SOURCES = \
-	$(libxfsm_logout_plugin_built_sources)
-
-DISTCLEANFILES += \
-	$(libxfsm_logout_plugin_built_sources)
-
-xfsm-logout-plugin-ui.h: $(srcdir)/xfsm-logout-plugin-ui.xml Makefile
-	$(AM_V_GEN) exo-csource --static --strip-comments --strip-content --name=logout_plugin_ui $< > $@
-endif
-
-# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/panel-plugin/xfsm-logout-plugin-ui.xml b/panel-plugin/xfsm-logout-plugin-ui.xml
deleted file mode 100644
index 2056038..0000000
--- a/panel-plugin/xfsm-logout-plugin-ui.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<ui>
-    <menubar name="main-menubar">
-        <menu action="session-menu">
-            <menuitem action="lock-screen"/>
-            <separator/>
-            <menuitem action="suspend"/>
-            <menuitem action="hibernate"/>
-            <separator/>
-            <menuitem action="reboot"/>
-            <menuitem action="shutdown"/>
-            <separator/>
-            <menuitem action="logout"/>
-        </menu>
-    </menubar>
-</ui>
diff --git a/panel-plugin/xfsm-logout-plugin.c b/panel-plugin/xfsm-logout-plugin.c
deleted file mode 100644
index b8e25ab..0000000
--- a/panel-plugin/xfsm-logout-plugin.c
+++ /dev/null
@@ -1,420 +0,0 @@
-/*
- * Copyright (c) 2009 Brian Tarricone <brian at tarricone.org>
- * All rights reserved.
- *
- * 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, 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.
- *
- * The session id generator was taken from the KDE session manager.
- * Copyright (c) 2000 Matthias Ettrich <ettrich at kde.org>
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-
-#ifdef HAVE_PWD_H
-#include <pwd.h>
-#endif
-
-#include <dbus/dbus-glib.h>
-
-#include <gtk/gtk.h>
-
-#include <libxfce4util/libxfce4util.h>
-#include <libxfce4ui/libxfce4ui.h>
-#include <libxfce4panel/libxfce4panel.h>
-
-#include "xfsm-logout-plugin-ui.h"
-
-#define BORDER           12
-#define DEFAULT_TIMEOUT  30
-
-/* FIXME: don't copy this */
-typedef enum
-{
-  XFSM_SHUTDOWN_ASK = 0,
-  XFSM_SHUTDOWN_LOGOUT,
-  XFSM_SHUTDOWN_HALT,
-  XFSM_SHUTDOWN_REBOOT,
-  XFSM_SHUTDOWN_SUSPEND,
-  XFSM_SHUTDOWN_HIBERNATE,
-} XfsmShutdownType;
-
-
-typedef struct
-{
-    GtkActionGroup *action_group;
-
-    GtkWidget *dialog;
-    GtkWidget *dialog_label;
-    gchar *dialog_text_fmt;
-    guint time_left;
-    guint time_left_id;
-    gboolean allow_save;
-} XfsmLogoutPlugin;
-
-
-static void xfsm_logout_plugin_lock_screen(GtkAction *action,
-                                           gpointer user_data);
-static void xfsm_logout_plugin_do_something(GtkAction *action,
-                                            gpointer user_data);
-
-/* FIXME: replace with xdg spec icon names where appropriate */
-static const GtkActionEntry action_entries[] =
-{
-    { "session-menu", NULL, N_("Session"), NULL, NULL, NULL },
-    { "lock-screen", "system-lock-screen", N_("Loc_k screen"), NULL, NULL, G_CALLBACK(xfsm_logout_plugin_lock_screen) },
-    { "suspend", "xfsm-suspend", N_("_Suspend"), NULL, NULL, G_CALLBACK(xfsm_logout_plugin_do_something) },
-    { "hibernate", "xfsm-hibernate", N_("_Hibernate"), NULL, NULL, G_CALLBACK(xfsm_logout_plugin_do_something) },
-    { "reboot", "xfsm-reboot", N_("_Reboot"), NULL, NULL, G_CALLBACK(xfsm_logout_plugin_do_something) },
-    { "shutdown", "system-shutdown", N_("Shut _down"), NULL, NULL, G_CALLBACK(xfsm_logout_plugin_do_something) },
-    { "logout", "system-log-out", N_("_Log out"), NULL, NULL, G_CALLBACK(xfsm_logout_plugin_do_something) },
-};
-
-static const struct
-{
-    const gchar *primary;
-    const gchar *secondary;
-    const gchar *button_text;
-    const gchar *button_icon_name;
-    const gchar *error_text;
-} dialog_strings[] = {
-    { NULL, NULL, NULL, NULL }, /* XFSM_SHUTDOWN_ASK */
-    {   /* XFSM_SHUTDOWN_LOGOUT */
-        N_("Are you sure you want to log out?"),
-        N_("You will be logged out in %u seconds."),
-        N_("_Log out"),
-        "system-log-out",
-        N_("Failed to log out.")
-    },
-    {   /* XFSM_SHUTDOWN_HALT */
-        N_("Are you sure you want to shut down?"),
-        N_("Your system will shut down in %u seconds."),
-        N_("Shut _down"),
-        "system-shutdown",
-        N_("Failed to shut down.")
-    },
-    {   /* XFSM_SHUTDOWN_REBOOT */
-        N_("Are you sure you want to reboot?"),
-        N_("Your system will reboot in %u seconds."),
-        N_("_Reboot"),
-        "xfsm-reboot",
-        N_("Failed to reboot.")
-    },
-    {   /* XFSM_SHUTDOWN_SUSPEND */
-        NULL,
-        NULL,
-        N_("_Suspend"),
-        "xfsm-suspend",
-        N_("Failed to suspend")
-    },
-    {   /* XFSM_SHUTDOWN_HIBERNATE */
-        NULL,
-        NULL,
-        N_("_Hibernate"),
-        "xfsm-hibernate",
-        N_("Failed to hibernate")
-    },
-};
-
-static void
-xfsm_logout_plugin_lock_screen(GtkAction *action,
-                          gpointer user_data)
-{
-    GError *error = NULL;
-
-    if (!g_spawn_command_line_async("xflock4", &error)) {
-        xfce_dialog_show_error (NULL,
-                                error,
-                                _("Xflock4 could not be launched"));
-    }
-}
-
-static gboolean
-xfsm_logout_plugin_do_dbus_call(XfsmLogoutPlugin *logout_plugin,
-                                XfsmShutdownType type,
-                                GError **error)
-{
-    DBusGConnection *conn;
-    DBusGProxy *proxy;
-    gboolean ret;
-
-    g_return_val_if_fail(logout_plugin != NULL, FALSE);
-    g_return_val_if_fail(type >= XFSM_SHUTDOWN_LOGOUT && type <= XFSM_SHUTDOWN_HIBERNATE, FALSE);
-    g_return_val_if_fail(!error || !*error, FALSE);
-
-    conn = dbus_g_bus_get(DBUS_BUS_SESSION, error);
-    if(!conn)
-        return FALSE;
-
-    proxy = dbus_g_proxy_new_for_name(conn, "org.xfce.SessionManager",
-                                      "/org/xfce/SessionManager",
-                                      "org.xfce.Session.Manager");
-    ret = dbus_g_proxy_call(proxy, "Shutdown", error,
-                            G_TYPE_UINT, type,
-                            G_TYPE_BOOLEAN, logout_plugin->allow_save,
-                            G_TYPE_INVALID, G_TYPE_INVALID);
-    g_object_unref(G_OBJECT(proxy));
-
-    return ret;
-}
-
-static gboolean
-xfsm_logout_dialog_update_time_left(gpointer data)
-{
-    XfsmLogoutPlugin *logout_plugin = data;
-    gchar *text;
-
-    if(--logout_plugin->time_left == 0) {
-        /* unattended shutdown, so don't allow apps to cancel shutdown */
-        logout_plugin->allow_save = FALSE;
-        logout_plugin->time_left_id = 0;
-        gtk_dialog_response(GTK_DIALOG(logout_plugin->dialog),
-                            GTK_RESPONSE_ACCEPT);
-        return FALSE;
-    }
-
-    text = g_strdup_printf(logout_plugin->dialog_text_fmt,
-                           logout_plugin->time_left);
-    gtk_label_set_markup(GTK_LABEL(logout_plugin->dialog_label), text);
-    g_free(text);
-
-    return TRUE;
-}
-
-static void
-xfsm_logout_plugin_show_confirmation_dialog(XfsmLogoutPlugin *logout_plugin,
-                                            XfsmShutdownType type)
-{
-    gint resp = GTK_RESPONSE_ACCEPT;
-
-    g_return_if_fail(logout_plugin != NULL);
-    g_return_if_fail(type >= XFSM_SHUTDOWN_LOGOUT && type <= XFSM_SHUTDOWN_HIBERNATE);
-
-    logout_plugin->allow_save = TRUE;
-
-    if(type != XFSM_SHUTDOWN_SUSPEND && type != XFSM_SHUTDOWN_HIBERNATE) {
-        GtkWidget *dialog, *topvbox, *hbox, *image, *label;
-        GtkWidget *button, *btn_hbox, *align;
-        gchar *text;
-
-        dialog = gtk_dialog_new_with_buttons(_("Close Session"), NULL,
-                                             GTK_DIALOG_NO_SEPARATOR,
-                                             GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                                             NULL);
-        gtk_window_set_keep_above(GTK_WINDOW(dialog), TRUE);
-        gtk_window_stick(GTK_WINDOW(dialog));
-        gtk_window_set_skip_taskbar_hint(GTK_WINDOW(dialog), TRUE);
-        gtk_container_set_border_width(GTK_CONTAINER(dialog), BORDER/6);
-
-        button = gtk_button_new();
-        GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
-        gtk_dialog_add_action_widget(GTK_DIALOG(dialog), button,
-                                     GTK_RESPONSE_ACCEPT);
-
-        align = gtk_alignment_new(0.5, 0.5, 0.0, 0.0);
-        gtk_container_add(GTK_CONTAINER(button), align);
-
-        btn_hbox = gtk_hbox_new(FALSE, BORDER/6);
-        gtk_container_add(GTK_CONTAINER(align), btn_hbox);
-
-        image = gtk_image_new_from_icon_name(dialog_strings[type].button_icon_name,
-                                             GTK_ICON_SIZE_BUTTON);
-        gtk_box_pack_start(GTK_BOX(btn_hbox), image, FALSE, FALSE, 0);
-
-        label = gtk_label_new_with_mnemonic(_(dialog_strings[type].button_text));
-        gtk_label_set_mnemonic_widget(GTK_LABEL(label), button);
-        gtk_box_pack_end(GTK_BOX(btn_hbox), label, FALSE, FALSE, 0);
-
-        gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT);
-
-        topvbox = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
-
-        hbox = gtk_hbox_new(FALSE, BORDER);
-        gtk_container_set_border_width(GTK_CONTAINER(hbox), BORDER/2);
-        gtk_box_pack_start(GTK_BOX(topvbox), hbox, FALSE, FALSE, 0);
-
-        image = gtk_image_new_from_stock(GTK_STOCK_DIALOG_QUESTION,
-                                         GTK_ICON_SIZE_DIALOG);
-        gtk_misc_set_alignment(GTK_MISC(image), 0.0, 0.0);
-        gtk_box_pack_start(GTK_BOX(hbox), image, TRUE, FALSE, 0);
-
-        logout_plugin->dialog_text_fmt = g_strdup_printf("<span weight='bold' size='larger'>%s</span>\n\n%s",
-                                                         _(dialog_strings[type].primary),
-                                                         _(dialog_strings[type].secondary));
-        text = g_strdup_printf(logout_plugin->dialog_text_fmt, DEFAULT_TIMEOUT);
-
-        label = gtk_label_new(NULL);
-        gtk_label_set_markup(GTK_LABEL(label), text);
-        gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
-        gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);
-
-        g_free(text);
-
-        logout_plugin->dialog = dialog;
-        logout_plugin->dialog_label = label;
-        logout_plugin->time_left = DEFAULT_TIMEOUT;
-        logout_plugin->time_left_id = g_timeout_add_seconds(1,
-                                                            xfsm_logout_dialog_update_time_left,
-                                                            logout_plugin);
-
-        gtk_widget_show_all(dialog);
-        resp = gtk_dialog_run(GTK_DIALOG(dialog));
-
-        if(logout_plugin->time_left_id) {
-            g_source_remove(logout_plugin->time_left_id);
-            logout_plugin->time_left_id = 0;
-        }
-
-        g_free(logout_plugin->dialog_text_fmt);
-        logout_plugin->dialog_text_fmt = NULL;
-
-        gtk_widget_destroy(dialog);
-        logout_plugin->dialog = NULL;
-        logout_plugin->dialog_label = NULL;
-
-        /* get the dialog to go away */
-        while(gtk_events_pending())
-            gtk_main_iteration();
-    }
-
-    if(resp == GTK_RESPONSE_ACCEPT) {
-        GError *error = NULL;
-
-        if(!xfsm_logout_plugin_do_dbus_call(logout_plugin, type, &error)) {
-            xfce_dialog_show_error (NULL,
-                                    error,
-                                    "%s",
-                                    dialog_strings[type].error_text);
-            g_error_free(error);
-        }
-    }
-}
-
-static void
-xfsm_logout_plugin_do_something(GtkAction *action,
-                                gpointer user_data)
-{
-    XfsmLogoutPlugin *plugin = user_data;
-    const gchar *name;
-    XfsmShutdownType type = XFSM_SHUTDOWN_ASK;
-
-    name = gtk_action_get_name(action);
-    if(!strcmp(name, "logout"))
-        type = XFSM_SHUTDOWN_LOGOUT;
-    else if(!strcmp(name, "reboot"))
-        type = XFSM_SHUTDOWN_REBOOT;
-    else if(!strcmp(name, "shutdown"))
-        type = XFSM_SHUTDOWN_HALT;
-    else if(!strcmp(name, "suspend"))
-        type = XFSM_SHUTDOWN_SUSPEND;
-    else if(!strcmp(name, "hibernate"))
-        type = XFSM_SHUTDOWN_HIBERNATE;
-    else {
-        g_critical(G_STRLOC ": Invalid action \"%s\"", name);
-        return;
-    }
-
-    xfsm_logout_plugin_show_confirmation_dialog(plugin, type);
-}
-
-static void
-xfsm_logout_plugin_free_data(XfcePanelPlugin *plugin,
-                             gpointer user_data)
-{
-    XfsmLogoutPlugin *logout_plugin = user_data;
-
-    if(logout_plugin->dialog) {
-        /* this will take care of cleaning up the timeout source as
-         * well as destroying the dialog */
-        gtk_dialog_response(GTK_DIALOG(logout_plugin->dialog),
-                            GTK_RESPONSE_CANCEL);
-    }
-
-    g_object_unref(G_OBJECT(logout_plugin->action_group));
-
-    g_free(logout_plugin);
-}
-
-static void
-xfsm_logout_plugin_construct(XfcePanelPlugin *plugin)
-{
-    XfsmLogoutPlugin *logout_plugin;
-    GtkUIManager *uimgr;
-    GtkWidget *menubar, *mi;
-#ifdef HAVE_GETPWUID
-    GtkWidget *label;
-    struct passwd *pwent;
-#endif
-
-    xfce_textdomain(GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
-
-    gdk_set_sm_client_id("fake-client-id-xfsm-logout-plugin");
-    gtk_window_set_default_icon_name("xfce4-session");
-    /* obey Fitt's law */
-    gtk_rc_parse_string("style \"menubar-style\" {\n"
-                        "    GtkMenuBar::shadow-type = GTK_SHADOW_NONE\n"
-                        "}\n"
-                        "class \"GtkMenuBar\" style \"menubar-style\"");
-
-    logout_plugin = g_new0(XfsmLogoutPlugin, 1);
-
-    logout_plugin->action_group = gtk_action_group_new("logout-plugin");
-    gtk_action_group_set_translation_domain(logout_plugin->action_group,
-                                            GETTEXT_PACKAGE);
-    gtk_action_group_add_actions(logout_plugin->action_group, action_entries,
-                                 G_N_ELEMENTS(action_entries),
-                                 logout_plugin);
-
-    uimgr = gtk_ui_manager_new();
-    gtk_ui_manager_insert_action_group(uimgr, logout_plugin->action_group, 0);
-    gtk_ui_manager_add_ui_from_string(uimgr, logout_plugin_ui,
-                                      logout_plugin_ui_length, NULL);
-
-    mi = gtk_ui_manager_get_widget(uimgr, "/main-menubar/session-menu");
-
-#ifdef HAVE_GETPWUID
-    pwent = getpwuid(geteuid());
-    if(pwent) {
-        label = gtk_bin_get_child(GTK_BIN(mi));
-        gtk_label_set_text(GTK_LABEL(label), pwent->pw_name);
-    }
-#endif
-
-    menubar = gtk_ui_manager_get_widget(uimgr, "/main-menubar");
-    gtk_container_set_border_width(GTK_CONTAINER(menubar), 0);
-    gtk_container_add(GTK_CONTAINER(plugin), menubar);
-    xfce_panel_plugin_add_action_widget(plugin, menubar);
-
-    /* returning TRUE from size-changed disables the panel's size
-     * handling code for the plugin */
-    g_signal_connect(plugin, "size-changed", G_CALLBACK(gtk_true), NULL);
-    g_signal_connect(plugin, "free-data",
-                     G_CALLBACK(xfsm_logout_plugin_free_data), logout_plugin);
-
-    gtk_widget_show_all(GTK_WIDGET(plugin));
-    g_object_unref(G_OBJECT(uimgr));
-}
-
-XFCE_PANEL_PLUGIN_REGISTER(xfsm_logout_plugin_construct)
diff --git a/panel-plugin/xfsm-logout-plugin.desktop.in b/panel-plugin/xfsm-logout-plugin.desktop.in
deleted file mode 100644
index 06c3767..0000000
--- a/panel-plugin/xfsm-logout-plugin.desktop.in
+++ /dev/null
@@ -1,7 +0,0 @@
-[Xfce Panel]
-Type=X-XFCE-PanelPlugin
-_Name=Session Menu
-_Comment=Shows a menu with options to lock the screen, suspend, shutdown, or log out
-Icon=xfce4-session
-X-XFCE-Module=xfsm-logout-plugin
-X-XFCE-Internal=FALSE
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 5dce11d..7f84380 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -5,7 +5,6 @@ engines/balou/balou-theme.c
 engines/balou/config.c
 engines/mice/mice.c
 engines/simple/simple.c
-panel-plugin/xfsm-logout-plugin.c
 settings/main.c
 settings/session-editor.c
 settings/splash-settings.c
@@ -28,6 +27,5 @@ xfce4-session-logout/xfce4-session-logout.desktop.in
 
 
 # files added by intltool-prepare.
-panel-plugin/xfsm-logout-plugin.desktop.in
 settings/xfce-session-settings.desktop.in
 settings/xfce4-session-settings.glade


More information about the Xfce4-commits mailing list