[Xfce4-commits] [panel-plugins/xfce4-timer-plugin] 02/22: Bring to the present
noreply at xfce.org
noreply at xfce.org
Sat Dec 30 06:16:23 CET 2017
This is an automated email from the git hooks/post-receive script.
a n d r e p u s h e d a c o m m i t t o b r a n c h m a s t e r
in repository panel-plugins/xfce4-timer-plugin.
commit 8eec0764a87674e563fd88a0160c011c89f19077
Author: Daniel Muñiz Fontoira <dani at damufo.com>
Date: Wed Jul 26 17:24:48 2017 +0200
Bring to the present
autogen.sh -> like sample-plugin
configure.ac.in -> remaked content like xfce4-sample-plugin
Makefile.am -> remaked content like xfce4-sample-plugin
xfce4-timer-plugin.desktop.in -> remaked content like
xfce4-sample-plugin
panel-plugin/Makefile.am -> remaked content like xfce4-sample-plugin
panel-plugin/xfcetimer.c -> deleted if HAVE_XFCE48,
XFCE_PANEL_PLUGIN_REGISTER, update new icon name
(xfce4-timer-plugin.png)
icons/Makefile.am -> update new icon name xfce4-sample-plugin
---
Makefile.am | 38 +++++---
autogen.sh | 37 ++++----
configure.ac.in | 136 ++++++++++++++++++++---------
icons/48x48/Makefile.am | 2 +-
panel-plugin/Makefile.am | 103 +++++++++++-----------
panel-plugin/xfce4-timer-plugin.desktop.in | 12 +--
panel-plugin/xfcetimer.c | 54 +++---------
7 files changed, 211 insertions(+), 171 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index dcc8c7c..f14bf63 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,24 +1,32 @@
-## Process this file with automake to produce Makefile.in
-## Created by Anjuta - will be overwritten
-## If you don't want it to overwrite it,
-## Please disable it in the Anjuta project configuration
-
-SUBDIRS = \
- src \
- po \
- icons
-
-AUTOMAKE_OPTIONS = \
- 1.8 \
- dist-bzip2
-
+ at SET_MAKE@
+
+AUTOMAKE_OPTIONS = subdir-objects
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+
+SUBDIRS = \
+ icons \
+ panel-plugin \
+ po
+
distclean-local:
rm -rf *.cache *~
+distuninstallcheck_listfiles = \
+ find . -type f -print | grep -v ./share/icons/hicolor/icon-theme.cache
+
rpm: dist
rpmbuild -ta $(PACKAGE)-$(VERSION).tar.gz
@rm -f $(PACKAGE)-$(VERSION).tar.gz
+.PHONY: ChangeLog
+
+ChangeLog: Makefile
+ (GIT_DIR=$(top_srcdir)/.git git log > .changelog.tmp \
+ && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) \
+ || (touch ChangeLog; echo 'Git directory not found: installing possibly empty changelog.' >&2)
+
+dist-hook: ChangeLog
+
EXTRA_DIST = \
intltool-extract.in \
intltool-merge.in \
@@ -28,3 +36,5 @@ DISTCLEANFILES = \
intltool-extract \
intltool-merge \
intltool-update
+
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/autogen.sh b/autogen.sh
index b5875b6..a600069 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,32 +1,35 @@
#!/bin/sh
#
-# vi:set et ai sw=2 sts=2 ts=2: */
-#-
-# Copyright (c) Xfce Development Team
+# Copyright (c) 2002-2017 The Xfce development team. 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 of
-# the License, or (at your option) any later version.
+# This library 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.
+# 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 General Public License for
+# more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# Written for Xfce by Benedikt Meurer <benny at xfce.org>.
#
-# 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.
(type xdt-autogen) >/dev/null 2>&1 || {
cat >&2 <<EOF
autogen.sh: You don't seem to have the Xfce development tools installed on
your system, which are required to build this software.
Please install the xfce4-dev-tools package first, it is available
- from http://www.xfce.org/.
+ from https://www.xfce.org/.
EOF
exit 1
}
-XDT_AUTOGEN_REQUIRED_VERSION="4.7.2" exec xdt-autogen $@
+test -d m4 || mkdir m4
+
+XDT_AUTOGEN_REQUIRED_VERSION="4.9.1" \
+exec xdt-autogen $@
diff --git a/configure.ac.in b/configure.ac.in
index ddb40a6..8cc650b 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -1,60 +1,118 @@
-dnl Process this file with autoconf to produce a configure script.
-dnl Created by Anjuta - will be overwritten
-dnl If you don't want it to overwrite it,
-dnl Please disable it in the Anjuta project configuration
+dnl $Id$
+dnl
+dnl xfce4-timer-plugin - A timer plugin for the Xfce panel
+dnl
+dnl
+dnl
-dnl version info
+dnl ***************************
+dnl *** Version information ***
+dnl ***************************
m4_define([xfce4_timer_version_major], [1])
m4_define([xfce4_timer_version_minor], [6])
m4_define([xfce4_timer_version_micro], [0])
+m4_define([sample_version_nano], []) dnl leave this empty to have no nano version
m4_define([xfce4_timer_version_build], [@REVISION@])
m4_define([xfce4_timer_version_tag]) # Leave empty only for releases, but use 'git' in most cases
-m4_define([xfce4_timer_version], [xfce4_timer_version_major().xfce4_timer_version_minor().xfce4_timer_version_micro()ifelse(xfce4_timer_version_tag(), [], [],[xfce4_timer_version_tag()-xfce4_timer_version_build()])])
+m4_define([xfce4_timer_version], [xfce4_timer_version_major().xfce4_timer_version_minor().xfce4_timer_version_micro()ifelse(xfce4_timer_version_nano(), [], [], [.xfce4_timer_version_nano()])ifelse(xfce4_timer_version_tag(), [git], [xfce4_timer_version_tag()-xfce4_timer_version_build()], [xfce4_timer_version_tag()])])
-libexecdir = ${exec_prefix}/libexec
-
-dnl init autoconf
-AC_INIT([xfce4-timer-plugin], [xfce4_timer_version], [ilgar_eroglu at yahoo.com])
+AC_CONFIG_MACRO_DIR([m4])
+dnl ***************************
+dnl *** Initialize autoconf ***
+dnl ***************************
+AC_COPYRIGHT([Copyright (C) 2017
+ The Xfce development team. All rights reserved.])
+AC_INIT([xfce4-timer-plugin], [xfce4-timer_version], [https://bugzilla.xfce.org/], [xfce4-timer-plugin])
AC_PREREQ([2.50])
+AC_REVISION([xfce4_panel_version_build])
+
+dnl ***************************
+dnl *** Initialize automake ***
+dnl ***************************
+AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-bzip2 tar-ustar])
+AC_CONFIG_HEADER([config.h])
+AM_MAINTAINER_MODE()
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
+nl **************************
+dnl *** Initialize libtool ***
+dnl **************************
+LT_PREREQ([2.2.6])
+LT_INIT([disable-static])
-dnl init automake
-dnl XFCE4_TIMER_VERSION=xfce4_timer_version
-dnl AM_INIT_AUTOMAKE([xfce4-timer-plugin], [$XFCE4_TIMER_VERSION])
-AM_INIT_AUTOMAKE([1.9 dist-bzip2 tar-ustar])
-AM_CONFIG_HEADER([config.h])
-AM_MAINTAINER_MODE
-
-dnl Check for basic stuff
-AC_PROG_CC
-AC_HEADER_STDC
-AC_PROG_INSTALL
-AC_PROG_LIBTOOL
-AC_PROG_INTLTOOL()
-AM_PROG_CC_C_O
-
-dnl check for standard header files
-AC_HEADER_STDC
-
-dnl Check for i18n support
+dnl ********************************
+dnl *** Check for basic programs ***
+dnl ********************************
+AC_PROG_CC()
+AC_PROG_CC_C_O()
+AC_PROG_LD()
+AC_PROG_INSTALL()
+IT_PROG_INTLTOOL([0.35.0])
+
+dnl **********************************
+dnl *** Check for standard headers ***
+dnl **********************************
+AC_HEADER_STDC()
+AC_CHECK_HEADERS([stdlib.h unistd.h locale.h stdio.h errno.h time.h string.h \
+ math.h sys/types.h sys/wait.h memory.h signal.h sys/prctl.h \
+ libintl.h])
+AC_CHECK_FUNCS([bind_textdomain_codeset])
+
+dnl ******************************
+dnl *** Check for i18n support ***
+dnl ******************************
XDT_I18N([@LINGUAS@])
-dnl required
+dnl *******************************
+dnl *** Check for X11 installed ***
+dnl *******************************
+XDT_CHECK_LIBX11_REQUIRE()
+
+dnl ***********************************
+dnl *** Check for required packages ***
+dnl ***********************************
+dnl XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.12.0])
+dnl XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-2.0], [4.12.0])
+
XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.4.0])
XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.4.0])
-dnl AC_DEFINE ([HAS4UI], [TRUE], [Desc])
-XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.8.0], [has4ui=true] , [XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.2.0], [has4ui=false])])
-AM_CONDITIONAL([HAVE_4UI], [test x$has4ui = xtrue])
-dnl XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.2.0])
-XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.20])
-XDT_CHECK_OPTIONAL_PACKAGE([XFCE48], [libxfce4panel-1.0], [4.8.0])
-XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.3.0])
+XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.12.0])
+XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.12.0])
+XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.12.0])
+
+
+dnl ***********************************
+dnl *** Check for debugging support ***
+dnl ***********************************
+XDT_FEATURE_DEBUG()
+dnl *********************************
+dnl *** Substitute platform flags ***
+dnl *********************************
+AC_MSG_CHECKING([PLATFORM_CPPFLAGS])
+AC_MSG_RESULT([$PLATFORM_CPPFLAGS])
+AC_SUBST([PLATFORM_CPPFLAGS])
+AC_MSG_CHECKING([PLATFORM_CFLAGS])
+AC_MSG_RESULT([$PLATFORM_CFLAGS])
+AC_SUBST([PLATFORM_CFLAGS])
+AC_MSG_CHECKING([PLATFORM_LDFLAGS])
+AC_MSG_RESULT([$PLATFORM_LDFLAGS])
+AC_SUBST([PLATFORM_LDFLAGS])
AC_OUTPUT([
Makefile
-po/Makefile.in
-src/Makefile
icons/Makefile
icons/48x48/Makefile
+panel-plugin/Makefile
+po/Makefile.in
])
+
+dnl ***************************
+dnl *** Print configuration ***
+dnl ***************************
+echo
+echo "Build Configuration:"
+echo
+echo "* Debug Support: $enable_debug"
+echo
diff --git a/icons/48x48/Makefile.am b/icons/48x48/Makefile.am
index 1f2825a..8e2af1b 100644
--- a/icons/48x48/Makefile.am
+++ b/icons/48x48/Makefile.am
@@ -1,7 +1,7 @@
iconsdir = $(datadir)/icons/hicolor/48x48/apps
icons_DATA = \
- xfce4-timer.png
+ xfce4-timer-plugin.png
EXTRA_DIST = \
$(icons_DATA)
diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index 5a4f42f..9c84940 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -1,58 +1,55 @@
-## Process this file with automake to produce Makefile.in
-
-plugindir = $(libexecdir)/xfce4/panel-plugins
-plugin_PROGRAMS = xfce4-timer
-
-# deprecated?
-#plugin_LTLIBRARIES = \
-# libxfce4_timer.la
-
-xfce4_timer_SOURCES = \
- xfcetimer.c xfcetimer.h
-
-if HAVE_4UI
-xfce4_timer_LDFLAGS = \
- @LIBXFCE4PANEL_LIBS@ \
- @LIBXFCE4UTIL_LIBS@ \
- @LIBXFCE4UI_LIBS@
-
-xfce4_timer_CFLAGS = \
+AM_CPPFLAGS = \
-I$(top_srcdir) \
- @LIBXFCE4UI_CFLAGS@ \
- @LIBXFCE4UTIL_CFLAGS@ \
- @LIBXFCE4PANEL_CFLAGS@ \
- -DPACKAGE_LOCALE_DIR=\"$(localedir)\"
-else
-xfce4_timer_LDFLAGS = \
- @LIBXFCE4PANEL_LIBS@ \
- @LIBXFCE4UTIL_LIBS@ \
- @LIBXFCEGUI4_LIBS@
-
-xfce4_timer_CFLAGS = \
- -I$(top_srcdir) \
- @LIBXFCEGUI4_CFLAGS@ \
- @LIBXFCE4UTIL_CFLAGS@ \
- @LIBXFCE4PANEL_CFLAGS@ \
- -DPACKAGE_LOCALE_DIR=\"$(localedir)\"
-endif
-# deprecated?
-#libxfce4_timer_la_LIBADD = \
-# @XFCE4_PANEL_LIBS@
-
-desktop_in_in_files = \
- xfce4-timer.desktop.in.in
-desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
-
-desktopdir = $(datadir)/xfce4/panel-plugins
-desktop_DATA = xfce4-timer.desktop
- at INTLTOOL_DESKTOP_RULE@
+ -DG_LOG_DOMAIN=\"xfce4-timer-plugin\" \
+ -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
+ $(PLATFORM_CPPFLAGS)
+
+#
+# xfce4 timer plugin
+#
+plugin_LTLIBRARIES = \
+ libxfcetimer.la
+
+plugindir = \
+ $(libdir)/xfce4/panel/plugins
+
+libxfcetimer_la_SOURCES = \
+ xfcetimer.c \
+ xfcetimer.h
+
+libxfcetimer_la_CFLAGS = \
+ $(LIBXFCE4UTIL_CFLAGS) \
+ $(LIBXFCE4UI_CFLAGS) \
+ $(LIBXFCE4PANEL_CFLAGS) \
+ $(PLATFORM_CFLAGS)
+
+libxfcetimer_la_LDFLAGS = \
+ -avoid-version \
+ -module \
+ -no-undefined \
+ -export-symbols-regex '^xfce_panel_module_(preinit|init|construct)' \
+ $(PLATFORM_LDFLAGS)
+
+libxfcetimer_la_LIBADD = \
+ $(LIBXFCE4UTIL_LIBS) \
+ $(LIBXFCE4UI_LIBS) \
+ $(LIBXFCE4PANEL_LIBS)
+
+#
+# Desktop file
+#
+desktopdir = \
+ $(datadir)/xfce4/panel/plugins
+
+desktop_DATA = \
+ xfce4-timer-plugin.desktop
-%.desktop.in: %.desktop.in.in
- sed -e "s^@EXTERNAL_PLUGIN_PATH@^$(plugindir)^" \
- $< > $@
+ at INTLTOOL_DESKTOP_RULE@
-EXTRA_DIST = \
- $(desktop_in_in_files)
+EXTRA_DIST = \
+ xfce4-timer-plugin.desktop.in
-DISTCLEANFILES = \
+CLEANFILES = \
$(desktop_DATA)
+
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/panel-plugin/xfce4-timer-plugin.desktop.in b/panel-plugin/xfce4-timer-plugin.desktop.in
index ae34402..a8be6d6 100644
--- a/panel-plugin/xfce4-timer-plugin.desktop.in
+++ b/panel-plugin/xfce4-timer-plugin.desktop.in
@@ -1,10 +1,10 @@
[Xfce Panel]
Type=X-XFCE-PanelPlugin
Encoding=UTF-8
-_Name=Xfce4 Timer
-_Comment=Timer plugin for Xfce panel
-Icon=xfce4-timer
+_Name=Xfce4 Timer Plugin
+_Comment=Xfce4 Timer Plugin for the Xfce panel
+Icon=xfce4-timer-plugin
+X-XFCE-Module=xfcetimer
X-XFCE-Internal=false
-X-XFCE-Exec=@EXTERNAL_PLUGIN_PATH@/xfce4-timer
-
-
+X-XFCE-Unique=false
+X-XFCE-API=2.0
diff --git a/panel-plugin/xfcetimer.c b/panel-plugin/xfcetimer.c
index 601772f..feda14a 100644
--- a/panel-plugin/xfcetimer.c
+++ b/panel-plugin/xfcetimer.c
@@ -35,16 +35,10 @@
#include <string.h>
#include <gtk/gtk.h>
-
+#include <glib/gprintf.h> // for gcc's warning: implicit declaration of function 'g_sprintf'
#include <libxfce4util/libxfce4util.h>
-#ifdef HAVE_XFCE48
#include <libxfce4ui/libxfce4ui.h>
-#include <libxfce4panel/libxfce4panel.h>
-#else
-#include <libxfcegui4/xfce_iconbutton.h>
#include <libxfce4panel/xfce-panel-plugin.h>
-#include <libxfcegui4/dialogs.h>
-#endif
#include "xfcetimer.h"
@@ -57,7 +51,7 @@ dialog_response (GtkWidget *dlg, int response, plugin_data *pd);
static void start_stop_selected (GtkWidget* menuitem, gpointer
data);
-XFCE_PANEL_PLUGIN_REGISTER_EXTERNAL(create_plugin_control);
+XFCE_PANEL_PLUGIN_REGISTER(create_plugin_control);
void make_menu(plugin_data *pd);
@@ -1080,11 +1074,8 @@ static void add_pbar(XfcePanelPlugin *plugin, plugin_data *pd){
if(xfce_panel_plugin_get_orientation(plugin)==GTK_ORIENTATION_HORIZONTAL){
pd->box=gtk_hbox_new(TRUE,0);
gtk_container_set_border_width (GTK_CONTAINER(pd->box), BORDER/2);
-#ifdef HAVE_XFCE48
+
gtk_container_add(GTK_CONTAINER(plugin),pd->box);
-#else
- gtk_container_add(GTK_CONTAINER(pd->eventbox),pd->box);
-#endif
gtk_progress_bar_set_orientation (GTK_PROGRESS_BAR(pd->
pbar),GTK_PROGRESS_BOTTOM_TO_TOP);
gtk_widget_set_size_request(GTK_WIDGET(pd->pbar),PBAR_THICKNESS,0);
@@ -1096,11 +1087,9 @@ static void add_pbar(XfcePanelPlugin *plugin, plugin_data *pd){
else{ /* horizontal bar */
pd->box=gtk_vbox_new(TRUE,0);
gtk_container_set_border_width (GTK_CONTAINER(pd->box), BORDER/2);
-#ifdef HAVE_XFCE48
+
gtk_container_add(GTK_CONTAINER(plugin),pd->box);
-#else
- gtk_container_add(GTK_CONTAINER(pd->eventbox),pd->box);
-#endif
+
gtk_progress_bar_set_orientation (GTK_PROGRESS_BAR(pd->
pbar),GTK_PROGRESS_LEFT_TO_RIGHT);
gtk_widget_set_size_request(GTK_WIDGET(pd->pbar),0,PBAR_THICKNESS);
@@ -1360,9 +1349,9 @@ plugin_free (XfcePanelPlugin *plugin, plugin_data *pd)
gtk_object_destroy(GTK_OBJECT(pd->tip));
/* destroy all widgets */
-#ifndef HAVE_XFCE48
+
gtk_widget_destroy(GTK_WIDGET(pd->eventbox));
-#endif
+
/* free the plugin data structure */
g_free(pd);
@@ -1491,7 +1480,7 @@ static void plugin_create_options (XfcePanelPlugin *plugin,plugin_data *pd) {
-#ifdef HAVE_XFCE48
+
header = xfce_titled_dialog_new_with_buttons (_("Xfce4 Timer Options"),
GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (plugin))),
GTK_DIALOG_DESTROY_WITH_PARENT |
@@ -1500,20 +1489,7 @@ static void plugin_create_options (XfcePanelPlugin *plugin,plugin_data *pd) {
NULL);
dlg = header;
-#else
- header = xfce_create_header (NULL, _("Xfce4 Timer Options"));
-
- dlg = gtk_dialog_new_with_buttons (_("Xfce 4 Timer Plugin"),
- GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (plugin))),
- GTK_DIALOG_DESTROY_WITH_PARENT |
- GTK_DIALOG_NO_SEPARATOR,
- GTK_STOCK_CLOSE, GTK_RESPONSE_OK,
- NULL);
-
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), header,
- FALSE, TRUE, 0);
-#endif
g_signal_connect (dlg, "response", G_CALLBACK (options_dialog_response),
pd);
@@ -1718,7 +1694,7 @@ Muhammad Ali Makki <makki.ma at gmail.com>\n\
Hunt Xu <huntxu at live.cn>\n\
Cheng-Chia Tseng <pswo10680 at gmail.com>\n";
- icon = xfce_panel_pixbuf_from_source("xfce4-timer", NULL, 48);
+ icon = xfce_panel_pixbuf_from_source("xfce4-timer-plugin", NULL, 48);
gtk_show_about_dialog(NULL,
"title", _("About xfce4-timer-plugin"),
"logo", icon,
@@ -1767,9 +1743,9 @@ static void create_plugin_control (XfcePanelPlugin *plugin)
G_TYPE_STRING, /* Column 2: Timer period/alarm time - info string */
G_TYPE_STRING); /* Command to run */
-#ifndef HAVE_XFCE48
+
pd->eventbox = gtk_event_box_new();
-#endif
+
pd->box=NULL;
pd->timer_on=FALSE;
pd->timeout=0;
@@ -1824,14 +1800,10 @@ static void create_plugin_control (XfcePanelPlugin *plugin)
gtk_widget_set_size_request(GTK_WIDGET(plugin),10,10);
xfce_panel_plugin_set_expand(plugin,FALSE);
-#ifdef HAVE_XFCE48
+
g_signal_connect (G_OBJECT(plugin), "button_press_event",
G_CALLBACK(pbar_clicked), pd);
-#else
- gtk_container_add(GTK_CONTAINER(plugin),pd->eventbox);
- g_signal_connect (G_OBJECT(pd->eventbox), "button_press_event",
- G_CALLBACK(pbar_clicked), pd);
-#endif
+
gtk_widget_show_all(GTK_WIDGET(plugin));
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list