[Goodies-commits] r2000 - in notification-daemon-xfce/trunk: . po themes/standard
Nick Schermer
nick at xfce.org
Sun Sep 10 12:56:03 CEST 2006
Author: nick
Date: 2006-09-10 10:55:54 +0000 (Sun, 10 Sep 2006)
New Revision: 2000
Modified:
notification-daemon-xfce/trunk/ChangeLog
notification-daemon-xfce/trunk/configure.in.in
notification-daemon-xfce/trunk/po/hu.po
notification-daemon-xfce/trunk/po/nl.po
notification-daemon-xfce/trunk/po/notification-daemon-xfce.pot
notification-daemon-xfce/trunk/themes/standard/theme.c
Log:
* Add build option to disable the close button inside
the default theme (--disable-close-button).
Modified: notification-daemon-xfce/trunk/ChangeLog
===================================================================
--- notification-daemon-xfce/trunk/ChangeLog 2006-09-10 09:21:49 UTC (rev 1999)
+++ notification-daemon-xfce/trunk/ChangeLog 2006-09-10 10:55:54 UTC (rev 2000)
@@ -1,6 +1,11 @@
+2006-09-10 12:48 nick
+
+ * Add build option to disable the close button inside
+ the default theme (--disable-close-button).
+
2006-09-07 19:00 nick
- * Better to to "re-display" the preview notification
+ * Better way to "re-display" the preview notification
2006-09-07 13:00 nick
Modified: notification-daemon-xfce/trunk/configure.in.in
===================================================================
--- notification-daemon-xfce/trunk/configure.in.in 2006-09-10 09:21:49 UTC (rev 1999)
+++ notification-daemon-xfce/trunk/configure.in.in 2006-09-10 10:55:54 UTC (rev 2000)
@@ -4,30 +4,40 @@
dnl Ported to Xfce created by Nick Schermer <nick at xfce.org>
dnl
-dnl version info
+dnl ********************
+dnl *** version info ***
+dnl ********************
m4_define([notification_daemon_major_version], [0])
m4_define([notification_daemon_minor_version], [3])
m4_define([notification_daemon_micro_version], [6])
m4_define([notification_daemon_version], [notification_daemon_major_version().notification_daemon_minor_version().notification_daemon_micro_version()])
-dnl init autoconf
+dnl *********************
+dnl *** init autoconf ***
+dnl *********************
AC_INIT([notification-daemon-xfce], [notification_daemon_version], [goodies-dev at xfce.org])
AC_PREREQ([2.50])
-dnl init automake
+dnl *********************
+dnl *** init automake ***
+dnl *********************
NOTIFICATION_DAEMON_VERSION=notification_daemon_version
AM_INIT_AUTOMAKE([notification-daemon-xfce], [$NOTIFICATION_DAEMON_VERSION])
AM_CONFIG_HEADER([config.h])
AM_MAINTAINER_MODE
-dnl check for basic programs
+dnl ********************************
+dnl *** check for basic programs ***
+dnl ********************************
AC_PROG_CC
AC_PROG_INSTALL
AC_PROG_LIBTOOL
AC_PROG_INTLTOOL()
-dnl Version information
+dnl ***************************
+dnl *** version information ***
+dnl ***************************
NOTIFICATION_DAEMON_MAJOR_VERSION=notification_daemon_major_version()
NOTIFICATION_DAEMON_MINOR_VERSION=notification_daemon_minor_version()
NOTIFICATION_DAEMON_MICRO_VERSION=notification_daemon_micro_version()
@@ -35,17 +45,19 @@
AC_DEFINE_UNQUOTED(NOTIFICATION_DAEMON_MINOR_VERSION, $NOTIFICATION_DAEMON_MINOR_VERSION, [Minor])
AC_DEFINE_UNQUOTED(NOTIFICATION_DAEMON_MICRO_VERSION, $NOTIFICATION_DAEMON_MICRO_VERSION, [Micro])
-dnl check for standard header files
+dnl ***************************************
+dnl *** check for standard header files ***
+dnl ***************************************
AC_HEADER_STDC
-dnl Check for i18n support
+dnl ******************************
+dnl *** check for i18n support ***
+dnl ******************************
XDT_I18N([@LINGUAS@])
-dnl Check for X11 installed
-XDT_CHECK_LIBX11_REQUIRE
-XDT_CHECK_LIBSM
-
-dnl required
+dnl *************************
+dnl *** required packages ***
+dnl *************************
XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.6.0])
XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0])
XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.3.90])
@@ -54,14 +66,31 @@
XDT_CHECK_PACKAGE([DBUS], [dbus-1], [0.36])
XDT_CHECK_PACKAGE([LIBSEXY], [libsexy], [0.1.3])
-dnl optional
+dnl *************************
+dnl *** optional packages ***
+dnl *************************
XDT_CHECK_OPTIONAL_PACKAGE([XFCE_MCS_MANAGER], [xfce-mcs-manager], [4.2.2],
[mcs-plugin], [xfce-mcs-manager], [yes])
XDT_CHECK_OPTIONAL_PACKAGE([LIBNOTIFY], [libnotify], [0.4.0],
[settings-preview], [libnotify], [yes])
-dnl check for debugging support
+dnl ******************************************************
+dnl *** disable the close button in the standard theme ***
+dnl ******************************************************
+AC_ARG_ENABLE([close-button],
+ AC_HELP_STRING([--disable-close-button],
+ [Don't show the close button in the default theme.]),
+ [ac_enable_close_button=$enableval], [ac_enable_close_button=yes])
+AC_MSG_CHECKING([whether to show the close button in default theme])
+AC_MSG_RESULT([$ac_enable_close_button])
+if test x"$ac_enable_close_button" = x"yes"; then
+ AC_DEFINE([ENABLE_CLOSE_BUTTON], [1], [Define to 1 to show the close button.])
+fi
+
+dnl ***********************************
+dnl *** check for debugging support ***
+dnl ***********************************
XDT_FEATURE_DEBUG()
AC_OUTPUT([
Modified: notification-daemon-xfce/trunk/po/hu.po
===================================================================
--- notification-daemon-xfce/trunk/po/hu.po 2006-09-10 09:21:49 UTC (rev 1999)
+++ notification-daemon-xfce/trunk/po/hu.po 2006-09-10 10:55:54 UTC (rev 2000)
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-07 19:02+0200\n"
+"POT-Creation-Date: 2006-09-08 21:35+0200\n"
"PO-Revision-Date: 2006-09-07 00:05+0100\n"
"Last-Translator: SZERVÑC Attila <sas at 321.hu>\n"
"Language-Team: Hungarian\n"
Modified: notification-daemon-xfce/trunk/po/nl.po
===================================================================
--- notification-daemon-xfce/trunk/po/nl.po 2006-09-10 09:21:49 UTC (rev 1999)
+++ notification-daemon-xfce/trunk/po/nl.po 2006-09-10 10:55:54 UTC (rev 2000)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: 0.3.6\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-07 19:02+0200\n"
+"POT-Creation-Date: 2006-09-08 21:35+0200\n"
"PO-Revision-Date: 2006-09-07 12:03+0200\n"
"Last-Translator: Nick Schermer <nick at xfce.org>\n"
"Language-Team: Dutch\n"
Modified: notification-daemon-xfce/trunk/po/notification-daemon-xfce.pot
===================================================================
--- notification-daemon-xfce/trunk/po/notification-daemon-xfce.pot 2006-09-10 09:21:49 UTC (rev 1999)
+++ notification-daemon-xfce/trunk/po/notification-daemon-xfce.pot 2006-09-10 10:55:54 UTC (rev 2000)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-07 19:02+0200\n"
+"POT-Creation-Date: 2006-09-08 21:35+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
Modified: notification-daemon-xfce/trunk/themes/standard/theme.c
===================================================================
--- notification-daemon-xfce/trunk/themes/standard/theme.c 2006-09-10 09:21:49 UTC (rev 1999)
+++ notification-daemon-xfce/trunk/themes/standard/theme.c 2006-09-10 10:55:54 UTC (rev 2000)
@@ -274,6 +274,7 @@
gtk_misc_set_alignment(GTK_MISC(windata->summary_label), 0, 0);
gtk_label_set_line_wrap(GTK_LABEL(windata->summary_label), TRUE);
+#ifdef ENABLE_CLOSE_BUTTON
/* Add the close button */
close_button = gtk_button_new();
gtk_widget_show(close_button);
@@ -287,6 +288,7 @@
image = gtk_image_new_from_stock(GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU);
gtk_widget_show(image);
gtk_container_add(GTK_CONTAINER(close_button), image);
+#endif
windata->content_hbox = gtk_hbox_new(FALSE, 6);
gtk_box_pack_start(GTK_BOX(vbox), windata->content_hbox, FALSE, FALSE, 0);
More information about the Goodies-commits
mailing list