[Xfce4-commits] [xfce/xfce4-power-manager] 25/63: Drop the LXDE panel plugin
noreply at xfce.org
noreply at xfce.org
Sun Mar 22 13:02:20 CET 2015
This is an automated email from the git hooks/post-receive script.
eric pushed a commit to branch master
in repository xfce/xfce4-power-manager.
commit 0b2d0bc1bcd0cfe12f8a2ec7eaebd0465116560d
Author: Eric Koegel <eric.koegel at gmail.com>
Date: Sun Mar 15 13:58:31 2015 +0300
Drop the LXDE panel plugin
It won't support GTK3 in the LXPanel. It's suggested to either
keep using the 1.4 branch or to use the systray icon once again.
---
configure.ac.in | 12 --
panel-plugins/power-manager-plugin/Makefile.am | 12 +-
.../power-manager-plugin/lxde-0.7/Makefile.am | 56 ---------
.../lxde-0.7/lxde-power-manager-plugin.c | 93 ---------------
.../power-manager-plugin/lxde/Makefile.am | 56 ---------
.../lxde/lxde-power-manager-plugin.c | 123 --------------------
.../power-manager-plugin/power-manager-button.c | 3 -
.../power-manager-plugin/power-manager-button.h | 6 -
8 files changed, 1 insertion(+), 360 deletions(-)
diff --git a/configure.ac.in b/configure.ac.in
index 96d44cd..b198ad8 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -69,9 +69,6 @@ m4_define([libxfce4ui_minimum_version],[4.11.0])
m4_define([libxfce4util_minimum_version],[4.10.0])
m4_define([libxfce4panel_minimum_version],[4.11.0])
-m4_define([lxdepanel_new_minimum_version],[0.7.0])
-m4_define([lxdepanel_minimum_version],[0.5.6])
-
m4_define([libnotify_minimum_version], [0.4.1])
m4_define([upower_minimum_version], [0.9.7])
m4_define([xrandr_minimum_version], [1.2.0])
@@ -156,16 +153,9 @@ fi
XDT_CHECK_OPTIONAL_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-2.0], [libxfce4panel_minimum_version],
[xfce4panel], [To build plugin support for Xfce's panel])
-XDT_CHECK_OPTIONAL_PACKAGE([LXDEPANEL_NEW], [lxpanel], [lxdepanel_new_minimum_version],
-[lxdepanel],[To build plugin support for LXDE's panel])
-
-XDT_CHECK_OPTIONAL_PACKAGE([LXDEPANEL], [lxpanel], [lxdepanel_minimum_version],
-[lxdepanel],[To build plugin support for LXDE's panel])
AM_CONDITIONAL([BUILD_PANEL_PLUGINS], [test "x$build_panel_plugins" = "xyes"])
AM_CONDITIONAL([BUILD_XFCE_PLUGIN], [test "x$LIBXFCE4PANEL_FOUND" = "xyes" && test "x$build_panel_plugins" = "xyes"])
-AM_CONDITIONAL([BUILD_LXDE_NEW_PLUGIN], [test "x$LXDEPANEL_NEW_FOUND" = "xyes" && test "x$build_panel_plugins" = "xyes"])
-AM_CONDITIONAL([BUILD_LXDE_OLD_PLUGIN], [test "x$LXDEPANEL_NEW_FOUND" != "xyes" && test "x$LXDEPANEL_FOUND" = "xyes" && test "x$build_panel_plugins" = "xyes"])
#=======================================================#
@@ -232,8 +222,6 @@ src/Makefile
settings/Makefile
panel-plugins/Makefile
panel-plugins/power-manager-plugin/Makefile
-panel-plugins/power-manager-plugin/lxde-0.7/Makefile
-panel-plugins/power-manager-plugin/lxde/Makefile
panel-plugins/power-manager-plugin/xfce/Makefile
data/Makefile
data/icons/Makefile
diff --git a/panel-plugins/power-manager-plugin/Makefile.am b/panel-plugins/power-manager-plugin/Makefile.am
index e737a38..4f64e88 100644
--- a/panel-plugins/power-manager-plugin/Makefile.am
+++ b/panel-plugins/power-manager-plugin/Makefile.am
@@ -3,15 +3,5 @@ if BUILD_XFCE_PLUGIN
xfce_dir = xfce
endif
-if BUILD_LXDE_OLD_PLUGIN
-lxde_old_dir = lxde
-endif
-
-if BUILD_LXDE_NEW_PLUGIN
-lxde_new_dir = lxde-0.7
-endif
-
SUBDIRS = \
- $(xfce_dir) \
- $(lxde_old_dir) \
- $(lxde_new_dir)
+ $(xfce_dir)
diff --git a/panel-plugins/power-manager-plugin/lxde-0.7/Makefile.am b/panel-plugins/power-manager-plugin/lxde-0.7/Makefile.am
deleted file mode 100644
index 0d5faaa..0000000
--- a/panel-plugins/power-manager-plugin/lxde-0.7/Makefile.am
+++ /dev/null
@@ -1,56 +0,0 @@
-AM_CPPFLAGS = \
- -I$(top_srcdir) \
- -DG_LOG_DOMAIN=\"lxde-power-manager-plugin\" \
- -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
- $(PLATFORM_CPPFLAGS)
-
-
-#
-# lxde power manager plugin
-#
-
-plugin_LTLIBRARIES = \
- lxde_power_manager.la
-
-plugindir = \
- $(libdir)/lxpanel/plugins
-
-lxde_power_manager_la_SOURCES = \
- lxde-power-manager-plugin.c \
- ../power-manager-button.c \
- ../power-manager-button.h \
- ../scalemenuitem.c \
- ../scalemenuitem.h
-
-lxde_power_manager_la_CFLAGS = \
- -I$(top_srcdir) \
- -I$(top_srcdir)/src \
- -DLOCALEDIR=\"$(localedir)\" \
- -DLXDE_PLUGIN \
- $(LXDEPANEL_CFLAGS) \
- $(LIBXFCE4UTIL_CFLAGS) \
- $(LIBXFCE4UI_CFLAGS) \
- $(XFCONF_CFLAGS) \
- $(GTK_CFLAGS) \
- $(GLIB_CFLAGS) \
- $(PLATFORM_CPPFLAGS) \
- $(PLATFORM_CFLAGS) \
- $(DBUS_GLIB_CFLAGS) \
- $(UPOWER_CFLAGS)
-
-lxde_power_manager_la_LDFLAGS = \
- -avoid-version \
- -module \
- -no-undefined \
- $(PLATFORM_LDFLAGS)
-
-lxde_power_manager_la_LIBADD = \
- $(top_builddir)/common/libxfpmcommon.la \
- $(LXDEPANEL_LIBS) \
- $(LIBXFCE4UI_LIBS) \
- $(LIBXFCE4UTIL_LIBS) \
- $(XFCONF_LIBS) \
- $(GTK_LIBS) \
- $(GLIB_LIBS) \
- $(DBUS_GLIB_LIBS) \
- $(UPOWER_LIBS)
diff --git a/panel-plugins/power-manager-plugin/lxde-0.7/lxde-power-manager-plugin.c b/panel-plugins/power-manager-plugin/lxde-0.7/lxde-power-manager-plugin.c
deleted file mode 100644
index 80868f0..0000000
--- a/panel-plugins/power-manager-plugin/lxde-0.7/lxde-power-manager-plugin.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * * Copyright (C) 2014 Eric Koegel <eric at xfce.org>
- *
- * Licensed under the GNU General Public License Version 2
- *
- * 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 <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <gtk/gtk.h>
-#include <glib.h>
-#include <glib/gi18n-lib.h>
-
-
-#include "../power-manager-button.h"
-
-/* plugin structure */
-typedef struct
-{
- LXPanel *panel;
-
- /* panel widgets */
- GtkWidget *ebox;
- GtkWidget *power_manager_button;
-}
-PowerManagerPlugin;
-
-
-/* prototypes */
-static GtkWidget * power_manager_plugin_construct (LXPanel *panel, config_setting_t *settings);
-
-/* register the plugin */
-FM_DEFINE_MODULE(lxpanel_gtk, power_manager_plugin);
-
-/* Plugin descriptor. */
-LXPanelPluginInit fm_module_init_lxpanel_gtk = {
- .name = N_("Power Manager Plugin"),
- .description = N_("Display the battery levels of your devices and control the brightness of your display"),
- .new_instance = power_manager_plugin_construct
-};
-
-static GtkWidget *
-power_manager_plugin_new (LXPanel *panel)
-{
- PowerManagerPlugin *power_manager_plugin;
-
- /* allocate memory for the plugin structure */
- power_manager_plugin = g_new0 (PowerManagerPlugin, 1);
-
- /* pointer to panel */
- power_manager_plugin->panel = panel;
-
- /* create a panel ebox */
- power_manager_plugin->ebox = gtk_event_box_new ();
- gtk_widget_show (power_manager_plugin->ebox);
- gtk_event_box_set_visible_window (GTK_EVENT_BOX(power_manager_plugin->ebox), FALSE);
-
- power_manager_plugin->power_manager_button = power_manager_button_new ();
- power_manager_button_show(POWER_MANAGER_BUTTON(power_manager_plugin->power_manager_button));
- gtk_container_add (GTK_CONTAINER (power_manager_plugin->ebox), power_manager_plugin->power_manager_button);
-
- /* bind the plugin structure to the widget */
- lxpanel_plugin_set_data(power_manager_plugin->ebox, power_manager_plugin, g_free);
-
- return power_manager_plugin->ebox;
-}
-
-
-static GtkWidget *
-power_manager_plugin_construct (LXPanel *panel, config_setting_t *settings)
-{
- /* create the plugin */
- return power_manager_plugin_new (panel);
-}
diff --git a/panel-plugins/power-manager-plugin/lxde/Makefile.am b/panel-plugins/power-manager-plugin/lxde/Makefile.am
deleted file mode 100644
index 0d5faaa..0000000
--- a/panel-plugins/power-manager-plugin/lxde/Makefile.am
+++ /dev/null
@@ -1,56 +0,0 @@
-AM_CPPFLAGS = \
- -I$(top_srcdir) \
- -DG_LOG_DOMAIN=\"lxde-power-manager-plugin\" \
- -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
- $(PLATFORM_CPPFLAGS)
-
-
-#
-# lxde power manager plugin
-#
-
-plugin_LTLIBRARIES = \
- lxde_power_manager.la
-
-plugindir = \
- $(libdir)/lxpanel/plugins
-
-lxde_power_manager_la_SOURCES = \
- lxde-power-manager-plugin.c \
- ../power-manager-button.c \
- ../power-manager-button.h \
- ../scalemenuitem.c \
- ../scalemenuitem.h
-
-lxde_power_manager_la_CFLAGS = \
- -I$(top_srcdir) \
- -I$(top_srcdir)/src \
- -DLOCALEDIR=\"$(localedir)\" \
- -DLXDE_PLUGIN \
- $(LXDEPANEL_CFLAGS) \
- $(LIBXFCE4UTIL_CFLAGS) \
- $(LIBXFCE4UI_CFLAGS) \
- $(XFCONF_CFLAGS) \
- $(GTK_CFLAGS) \
- $(GLIB_CFLAGS) \
- $(PLATFORM_CPPFLAGS) \
- $(PLATFORM_CFLAGS) \
- $(DBUS_GLIB_CFLAGS) \
- $(UPOWER_CFLAGS)
-
-lxde_power_manager_la_LDFLAGS = \
- -avoid-version \
- -module \
- -no-undefined \
- $(PLATFORM_LDFLAGS)
-
-lxde_power_manager_la_LIBADD = \
- $(top_builddir)/common/libxfpmcommon.la \
- $(LXDEPANEL_LIBS) \
- $(LIBXFCE4UI_LIBS) \
- $(LIBXFCE4UTIL_LIBS) \
- $(XFCONF_LIBS) \
- $(GTK_LIBS) \
- $(GLIB_LIBS) \
- $(DBUS_GLIB_LIBS) \
- $(UPOWER_LIBS)
diff --git a/panel-plugins/power-manager-plugin/lxde/lxde-power-manager-plugin.c b/panel-plugins/power-manager-plugin/lxde/lxde-power-manager-plugin.c
deleted file mode 100644
index eda2d62..0000000
--- a/panel-plugins/power-manager-plugin/lxde/lxde-power-manager-plugin.c
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * * Copyright (C) 2014 Eric Koegel <eric at xfce.org>
- *
- * Licensed under the GNU General Public License Version 2
- *
- * 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 <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <gtk/gtk.h>
-#include <glib.h>
-#include <glib/gi18n-lib.h>
-
-#include "../power-manager-button.h"
-
-/* plugin structure */
-typedef struct
-{
- Plugin *plugin;
-
- /* panel widgets */
- GtkWidget *ebox;
- GtkWidget *power_manager_button;
-}
-PowerManagerPlugin;
-
-
-/* prototypes */
-static int lxde_power_manager_plugin_construct (Plugin *p, char **fp);
-static void lxde_power_manager_plugin_configuration_changed(Plugin *p);
-
-PluginClass lxde_power_manager_plugin_class = {
- PLUGINCLASS_VERSIONING,
- type : "lxde_power_manager",
- name : N_("Power Manager Plugin"),
- version: PACKAGE_VERSION,
- description : N_("Display the battery levels of your devices and control the brightness of your display"),
- one_per_system : FALSE,
- expand_available : FALSE,
- constructor : lxde_power_manager_plugin_construct,
- destructor : NULL,
- config : NULL,
- save : NULL,
- panel_configuration_changed : lxde_power_manager_plugin_configuration_changed
-};
-
-
-static PowerManagerPlugin *
-lxde_power_manager_plugin_new (Plugin *plugin)
-{
- PowerManagerPlugin *power_manager_plugin;
-
- /* allocate memory for the plugin structure */
- power_manager_plugin = g_new0 (PowerManagerPlugin, 1);
-
- /* pointer to plugin */
- power_manager_plugin->plugin = plugin;
-
- /* create some panel ebox */
- power_manager_plugin->ebox = gtk_event_box_new ();
- gtk_widget_show (power_manager_plugin->ebox);
- gtk_event_box_set_visible_window (GTK_EVENT_BOX(power_manager_plugin->ebox), FALSE);
-
- power_manager_plugin->power_manager_button = power_manager_button_new ();
- power_manager_button_show(POWER_MANAGER_BUTTON(power_manager_plugin->power_manager_button));
- gtk_container_add (GTK_CONTAINER (power_manager_plugin->ebox), power_manager_plugin->power_manager_button);
-
- return power_manager_plugin;
-}
-
-
-static int
-lxde_power_manager_plugin_construct (Plugin *plugin, char **fp)
-{
- PowerManagerPlugin *power_manager_plugin;
-
- /* create the plugin */
- power_manager_plugin = lxde_power_manager_plugin_new (plugin);
-
- /* add the ebox to the panel */
- plugin->pwid = power_manager_plugin->ebox;
- plugin->priv = power_manager_plugin;
-
- return 1;
-}
-
-static void
-lxde_power_manager_plugin_configuration_changed(Plugin *p)
-{
- PowerManagerPlugin *power_manager_plugin = p->priv;
-
- /* Determine orientation and size */
- GtkOrientation orientation = (p->panel->orientation == GTK_ORIENTATION_VERTICAL) ? GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL;
-
- int size = (orientation == GTK_ORIENTATION_VERTICAL) ? p->panel->width : p->panel->height;
-
- if ( orientation == GTK_ORIENTATION_HORIZONTAL )
- gtk_widget_set_size_request (p->pwid, -1, size);
- else
- gtk_widget_set_size_request (p->pwid, size, -1);
-
- /* update the button's width */
- power_manager_button_set_width (POWER_MANAGER_BUTTON(power_manager_plugin->power_manager_button), p->panel->icon_size);
-}
diff --git a/panel-plugins/power-manager-plugin/power-manager-button.c b/panel-plugins/power-manager-plugin/power-manager-button.c
index 1de4a91..2ec3438 100644
--- a/panel-plugins/power-manager-plugin/power-manager-button.c
+++ b/panel-plugins/power-manager-plugin/power-manager-button.c
@@ -896,9 +896,6 @@ GtkWidget *
#ifdef XFCE_PLUGIN
power_manager_button_new (XfcePanelPlugin *plugin)
#endif
-#ifdef LXDE_PLUGIN
-power_manager_button_new (void)
-#endif
#ifdef XFPM_SYSTRAY
power_manager_button_new (void)
#endif
diff --git a/panel-plugins/power-manager-plugin/power-manager-button.h b/panel-plugins/power-manager-plugin/power-manager-button.h
index f879e10..669701b 100644
--- a/panel-plugins/power-manager-plugin/power-manager-button.h
+++ b/panel-plugins/power-manager-plugin/power-manager-button.h
@@ -26,9 +26,6 @@
#ifdef XFCE_PLUGIN
#include <libxfce4panel/xfce-panel-plugin.h>
#endif
-#ifdef LXDE_PLUGIN
-#include <lxpanel/plugin.h>
-#endif
G_BEGIN_DECLS
@@ -59,9 +56,6 @@ GType power_manager_button_get_type (void) G_GNUC_CONST;
#ifdef XFCE_PLUGIN
GtkWidget *power_manager_button_new (XfcePanelPlugin *plugin);
#endif
-#ifdef LXDE_PLUGIN
-GtkWidget *power_manager_button_new (void);
-#endif
#ifdef XFPM_SYSTRAY
GtkWidget *power_manager_button_new (void);
#endif
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list