[Commits] Makefile.am 1.1.2.1 1.1.2.2 notification_banner.c 1.1.2.1 1.1.2.2 notification_banner.h 1.1.2.1 1.1.2.2 notification_command.c 1.1.2.1 1.1.2.2 notification_command.h 1.1.2.1 1.1.2.2 notification_core.c 1.1.2.1 1.1.2.2 notification_foldercheck.c 1.1.2.1 1.1.2.2 notification_foldercheck.h 1.1.2.1 1.1.2.2 notification_hotkeys.c 1.1.2.1 1.1.2.2 notification_hotkeys.h 1.1.2.1 1.1.2.2 notification_indicator.c 1.1.2.1 1.1.2.2 notification_indicator.h 1.1.2.1 1.1.2.2 notification_lcdproc.c 1.1.2.1 1.1.2.2 notification_lcdproc.h 1.1.2.1 1.1.2.2 notification_plugin.c 1.1.2.1 1.1.2.2 notification_plugin.h 1.1.2.1 1.1.2.2 notification_popup.c 1.1.2.1 1.1.2.2 notification_popup.h 1.1.2.1 1.1.2.2 notification_prefs.c 1.1.2.1 1.1.2.2 notification_prefs.h 1.1.2.1 1.1.2.2 notification_trayicon.c 1.1.2.1 1.1.2.2 notification_trayicon.h 1.1.2.1 1.1.2.2
colin at claws-mail.org
colin at claws-mail.org
Sun Feb 17 22:56:50 CET 2013
Update of /home/claws-mail/claws/src/plugins/notification
In directory srv:/tmp/cvs-serv17331/src/plugins/notification
Modified Files:
Tag: gtk2
Makefile.am notification_banner.c notification_banner.h
notification_command.c notification_command.h
notification_core.c notification_foldercheck.c
notification_foldercheck.h notification_hotkeys.c
notification_hotkeys.h notification_indicator.c
notification_indicator.h notification_lcdproc.c
notification_lcdproc.h notification_plugin.c
notification_plugin.h notification_popup.c
notification_popup.h notification_prefs.c notification_prefs.h
notification_trayicon.c notification_trayicon.h
Log Message:
2013-02-17 [colin] 3.9.0cvs76
* src/plugins/notification/Makefile.am
* src/plugins/notification/notification_banner.c
* src/plugins/notification/notification_banner.h
* src/plugins/notification/notification_command.c
* src/plugins/notification/notification_command.h
* src/plugins/notification/notification_core.c
* src/plugins/notification/notification_foldercheck.c
* src/plugins/notification/notification_foldercheck.h
* src/plugins/notification/notification_hotkeys.c
* src/plugins/notification/notification_hotkeys.h
* src/plugins/notification/notification_indicator.c
* src/plugins/notification/notification_indicator.h
* src/plugins/notification/notification_lcdproc.c
* src/plugins/notification/notification_lcdproc.h
* src/plugins/notification/notification_plugin.c
* src/plugins/notification/notification_plugin.h
* src/plugins/notification/notification_popup.c
* src/plugins/notification/notification_popup.h
* src/plugins/notification/notification_prefs.c
* src/plugins/notification/notification_prefs.h
* src/plugins/notification/notification_trayicon.c
* src/plugins/notification/notification_trayicon.h
Activate and fix notification (without libindicate)
Index: notification_foldercheck.h
===================================================================
RCS file: /home/claws-mail/claws/src/plugins/notification/Attic/notification_foldercheck.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- notification_foldercheck.h 17 Feb 2013 21:21:58 -0000 1.1.2.1
+++ notification_foldercheck.h 17 Feb 2013 21:56:48 -0000 1.1.2.2
@@ -20,7 +20,10 @@
#include <gtk/gtk.h>
-#include "pluginconfig.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+# include "claws-features.h"
+#endif
void notification_foldercheck_sel_folders_cb(GtkButton*, gpointer);
guint notification_register_folder_specific_list(gchar*);
Index: notification_banner.c
===================================================================
RCS file: /home/claws-mail/claws/src/plugins/notification/Attic/notification_banner.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- notification_banner.c 17 Feb 2013 21:21:58 -0000 1.1.2.1
+++ notification_banner.c 17 Feb 2013 21:56:48 -0000 1.1.2.2
@@ -15,7 +15,13 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "pluginconfig.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+# include "claws-features.h"
+#endif
+
+#include <glib.h>
+#include <glib/gi18n.h>
#ifdef NOTIFICATION_BANNER
Index: notification_banner.h
===================================================================
RCS file: /home/claws-mail/claws/src/plugins/notification/Attic/notification_banner.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- notification_banner.h 17 Feb 2013 21:21:58 -0000 1.1.2.1
+++ notification_banner.h 17 Feb 2013 21:56:48 -0000 1.1.2.2
@@ -18,7 +18,10 @@
#ifndef NOTIFICATION_BANNER_H
#define NOTIFICATION_BANNER_H NOTIFICATION_BANNER_H
-#include "pluginconfig.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+# include "claws-features.h"
+#endif
#ifdef NOTIFICATION_BANNER
Index: notification_foldercheck.c
===================================================================
RCS file: /home/claws-mail/claws/src/plugins/notification/Attic/notification_foldercheck.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- notification_foldercheck.c 17 Feb 2013 21:21:58 -0000 1.1.2.1
+++ notification_foldercheck.c 17 Feb 2013 21:56:48 -0000 1.1.2.2
@@ -18,7 +18,13 @@
/* This code is based on foldersel.c in Claws Mail.
* Some functions are only slightly modified, almost 1:1 copies from there. */
-#include "pluginconfig.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+# include "claws-features.h"
+#endif
+
+#include <glib.h>
+#include <glib/gi18n.h>
/* Basic definitions first */
#include "common/defs.h"
Index: notification_prefs.h
===================================================================
RCS file: /home/claws-mail/claws/src/plugins/notification/Attic/notification_prefs.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- notification_prefs.h 17 Feb 2013 21:21:58 -0000 1.1.2.1
+++ notification_prefs.h 17 Feb 2013 21:56:48 -0000 1.1.2.2
@@ -18,7 +18,10 @@
#ifndef NOTIFICATION_PREFS_H
#define NOTIFICATION_PREFS_H NOTIFICATION_PREFS_H
-#include "pluginconfig.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+# include "claws-features.h"
+#endif
#include <glib.h>
Index: notification_prefs.c
===================================================================
RCS file: /home/claws-mail/claws/src/plugins/notification/Attic/notification_prefs.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- notification_prefs.c 17 Feb 2013 21:21:58 -0000 1.1.2.1
+++ notification_prefs.c 17 Feb 2013 21:56:48 -0000 1.1.2.2
@@ -15,7 +15,13 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "pluginconfig.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+# include "claws-features.h"
+#endif
+
+#include <glib.h>
+#include <glib/gi18n.h>
#include <math.h>
@@ -387,7 +393,7 @@
{
static gchar *path[3];
- path[0] = D_("claws-mail", "Plugins");
+ path[0] = _("Plugins");
path[1] = _("Notification");
path[2] = NULL;
@@ -401,7 +407,7 @@
{
static gchar *hotkeys_path[4];
- hotkeys_path[0] = D_("claws-mail", "Plugins");
+ hotkeys_path[0] = _("Plugins");
hotkeys_path[1] = _("Notification");
hotkeys_path[2] = _("Hotkeys");
hotkeys_path[3] = NULL;
@@ -419,7 +425,7 @@
{
static gchar *banner_path[4];
- banner_path[0] = D_("claws-mail", "Plugins");
+ banner_path[0] = _("Plugins");
banner_path[1] = _("Notification");
banner_path[2] = _("Banner");
banner_path[3] = NULL;
@@ -436,7 +442,7 @@
{
static gchar *popup_path[4];
- popup_path[0] = D_("claws-mail", "Plugins");
+ popup_path[0] = _("Plugins");
popup_path[1] = _("Notification");
popup_path[2] = _("Popup");
popup_path[3] = NULL;
@@ -453,7 +459,7 @@
{
static gchar *command_path[4];
- command_path[0] = D_("claws-mail", "Plugins");
+ command_path[0] = _("Plugins");
command_path[1] = _("Notification");
command_path[2] = _("Command");
command_path[3] = NULL;
@@ -470,7 +476,7 @@
{
static gchar *lcdproc_path[4];
- lcdproc_path[0] = D_("claws-mail", "Plugins");
+ lcdproc_path[0] = _("Plugins");
lcdproc_path[1] = _("Notification");
lcdproc_path[2] = _("LCD");
lcdproc_path[3] = NULL;
@@ -487,7 +493,7 @@
{
static gchar *trayicon_path[4];
- trayicon_path[0] = D_("claws-mail", "Plugins");
+ trayicon_path[0] = _("Plugins");
trayicon_path[1] = _("Notification");
trayicon_path[2] = _("SysTrayicon");
trayicon_path[3] = NULL;
@@ -504,7 +510,7 @@
{
static gchar *indicator_path[4];
- indicator_path[0] = D_("claws-mail", "Plugins");
+ indicator_path[0] = _("Plugins");
indicator_path[1] = _("Notification");
indicator_path[2] = _("Indicator");
indicator_path[3] = NULL;
Index: notification_plugin.c
===================================================================
RCS file: /home/claws-mail/claws/src/plugins/notification/Attic/notification_plugin.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- notification_plugin.c 17 Feb 2013 21:21:58 -0000 1.1.2.1
+++ notification_plugin.c 17 Feb 2013 21:56:48 -0000 1.1.2.2
@@ -15,7 +15,13 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "pluginconfig.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+# include "claws-features.h"
+#endif
+
+#include <glib.h>
+#include <glib/gi18n.h>
#include "common/claws.h"
#include "common/version.h"
Index: notification_indicator.c
===================================================================
RCS file: /home/claws-mail/claws/src/plugins/notification/Attic/notification_indicator.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- notification_indicator.c 17 Feb 2013 21:21:58 -0000 1.1.2.1
+++ notification_indicator.c 17 Feb 2013 21:56:48 -0000 1.1.2.2
@@ -15,7 +15,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "pluginconfig.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+# include "claws-features.h"
+#endif
#ifdef NOTIFICATION_INDICATOR
Index: notification_plugin.h
===================================================================
RCS file: /home/claws-mail/claws/src/plugins/notification/Attic/notification_plugin.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- notification_plugin.h 17 Feb 2013 21:21:58 -0000 1.1.2.1
+++ notification_plugin.h 17 Feb 2013 21:56:48 -0000 1.1.2.2
@@ -18,7 +18,10 @@
#ifndef NOTIFICATION_PLUGIN_H
#define NOTIFICATION_PLUGIN_H NOTIFICATION_PLUGIN_H
-#include "pluginconfig.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+# include "claws-features.h"
+#endif
#ifdef NOTIFICATION_BANNER
void notification_update_banner(void);
Index: notification_indicator.h
===================================================================
RCS file: /home/claws-mail/claws/src/plugins/notification/Attic/notification_indicator.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- notification_indicator.h 17 Feb 2013 21:21:58 -0000 1.1.2.1
+++ notification_indicator.h 17 Feb 2013 21:56:48 -0000 1.1.2.2
@@ -18,7 +18,10 @@
#ifndef NOTIFICATION_INDICATOR_H
#define NOTIFICATION_INDICATOR_H NOTIFICATION_INDICATOR_H
-#include "pluginconfig.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+# include "claws-features.h"
+#endif
#ifdef NOTIFICATION_INDICATOR
Index: notification_trayicon.c
===================================================================
RCS file: /home/claws-mail/claws/src/plugins/notification/Attic/notification_trayicon.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- notification_trayicon.c 17 Feb 2013 21:21:58 -0000 1.1.2.1
+++ notification_trayicon.c 17 Feb 2013 21:56:48 -0000 1.1.2.2
@@ -18,7 +18,13 @@
/* This module is of course inspired by the trayicon plugin which is
* shipped with Claws-Mail, copyrighted by the Claws-Mail Team. */
-#include "pluginconfig.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+# include "claws-features.h"
+#endif
+
+#include <glib.h>
+#include <glib/gi18n.h>
#ifdef NOTIFICATION_TRAYICON
Index: Makefile.am
===================================================================
RCS file: /home/claws-mail/claws/src/plugins/notification/Attic/Makefile.am,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- Makefile.am 17 Feb 2013 21:21:58 -0000 1.1.2.1
+++ Makefile.am 17 Feb 2013 21:56:48 -0000 1.1.2.2
@@ -1,10 +1,10 @@
-if BUILD_HOTKEYS
-hotkey_lib = libcmnpgtkhotkey.la
-hotkey_lib_path = $(top_builddir)/src/plugins/notification/gtkhotkey/libcmnpgtkhotkey.la
-else
+#if BUILD_HOTKEYS
+#hotkey_lib = libcmnpgtkhotkey.la
+#hotkey_lib_path = $(top_builddir)/src/plugins/notification/gtkhotkey/libcmnpgtkhotkey.la
+#else
hotkey_lib =
hotkey_lib_path =
-endif
+#endif
EXTRA_DIST = claws.def plugin.def version.rc
Index: notification_trayicon.h
===================================================================
RCS file: /home/claws-mail/claws/src/plugins/notification/Attic/notification_trayicon.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- notification_trayicon.h 17 Feb 2013 21:21:58 -0000 1.1.2.1
+++ notification_trayicon.h 17 Feb 2013 21:56:48 -0000 1.1.2.2
@@ -18,7 +18,10 @@
#ifndef NOTIFICATION_TRAYICON_H
#define NOTIFICATION_TRAYICON_H NOTIFICATION_TRAYICON_H
-#include "pluginconfig.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+# include "claws-features.h"
+#endif
#ifdef NOTIFICATION_TRAYICON
Index: notification_command.c
===================================================================
RCS file: /home/claws-mail/claws/src/plugins/notification/Attic/notification_command.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- notification_command.c 17 Feb 2013 21:21:58 -0000 1.1.2.1
+++ notification_command.c 17 Feb 2013 21:56:48 -0000 1.1.2.2
@@ -15,7 +15,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "pluginconfig.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+# include "claws-features.h"
+#endif
#ifdef NOTIFICATION_COMMAND
Index: notification_core.c
===================================================================
RCS file: /home/claws-mail/claws/src/plugins/notification/Attic/notification_core.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- notification_core.c 17 Feb 2013 21:21:58 -0000 1.1.2.1
+++ notification_core.c 17 Feb 2013 21:56:48 -0000 1.1.2.2
@@ -15,7 +15,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "pluginconfig.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+# include "claws-features.h"
+#endif
#include "folder.h"
#include "folderview.h"
Index: notification_command.h
===================================================================
RCS file: /home/claws-mail/claws/src/plugins/notification/Attic/notification_command.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- notification_command.h 17 Feb 2013 21:21:58 -0000 1.1.2.1
+++ notification_command.h 17 Feb 2013 21:56:48 -0000 1.1.2.2
@@ -18,7 +18,10 @@
#ifndef NOTIFICATION_COMMAND_H
#define NOTIFICATION_COMMAND_H NOTIFICATION_COMMAND_H
-#include "pluginconfig.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+# include "claws-features.h"
+#endif
#ifdef NOTIFICATION_COMMAND
Index: notification_hotkeys.h
===================================================================
RCS file: /home/claws-mail/claws/src/plugins/notification/Attic/notification_hotkeys.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- notification_hotkeys.h 17 Feb 2013 21:21:58 -0000 1.1.2.1
+++ notification_hotkeys.h 17 Feb 2013 21:56:48 -0000 1.1.2.2
@@ -18,7 +18,10 @@
#ifndef NOTIFICATION_HOTKEYS_H
#define NOTIFICATION_HOTKEYS_H NOTIFICATION_HOTKEYS_H
-#include "pluginconfig.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+# include "claws-features.h"
+#endif
#ifdef NOTIFICATION_HOTKEYS
Index: notification_hotkeys.c
===================================================================
RCS file: /home/claws-mail/claws/src/plugins/notification/Attic/notification_hotkeys.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- notification_hotkeys.c 17 Feb 2013 21:21:58 -0000 1.1.2.1
+++ notification_hotkeys.c 17 Feb 2013 21:56:48 -0000 1.1.2.2
@@ -15,7 +15,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "pluginconfig.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+# include "claws-features.h"
+#endif
#ifdef NOTIFICATION_HOTKEYS
Index: notification_lcdproc.h
===================================================================
RCS file: /home/claws-mail/claws/src/plugins/notification/Attic/notification_lcdproc.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- notification_lcdproc.h 17 Feb 2013 21:21:58 -0000 1.1.2.1
+++ notification_lcdproc.h 17 Feb 2013 21:56:48 -0000 1.1.2.2
@@ -18,7 +18,10 @@
#ifndef NOTIFICATION_LCDPROC_H
#define NOTIFICATION_LCDPROC_H NOTIFICATION_LCDPROC_H
-#include "pluginconfig.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+# include "claws-features.h"
+#endif
#ifdef NOTIFICATION_LCDPROC
Index: notification_lcdproc.c
===================================================================
RCS file: /home/claws-mail/claws/src/plugins/notification/Attic/notification_lcdproc.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- notification_lcdproc.c 17 Feb 2013 21:21:58 -0000 1.1.2.1
+++ notification_lcdproc.c 17 Feb 2013 21:56:48 -0000 1.1.2.2
@@ -15,7 +15,13 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "pluginconfig.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+# include "claws-features.h"
+#endif
+
+#include <glib.h>
+#include <glib/gi18n.h>
#ifdef NOTIFICATION_LCDPROC
Index: notification_popup.c
===================================================================
RCS file: /home/claws-mail/claws/src/plugins/notification/Attic/notification_popup.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- notification_popup.c 17 Feb 2013 21:21:58 -0000 1.1.2.1
+++ notification_popup.c 17 Feb 2013 21:56:48 -0000 1.1.2.2
@@ -15,7 +15,13 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "pluginconfig.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+# include "claws-features.h"
+#endif
+
+#include <glib.h>
+#include <glib/gi18n.h>
#ifdef NOTIFICATION_POPUP
Index: notification_popup.h
===================================================================
RCS file: /home/claws-mail/claws/src/plugins/notification/Attic/notification_popup.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- notification_popup.h 17 Feb 2013 21:21:58 -0000 1.1.2.1
+++ notification_popup.h 17 Feb 2013 21:56:48 -0000 1.1.2.2
@@ -18,7 +18,10 @@
#ifndef NOTIFICATION_POPUP_H
#define NOTIFICATION_POPUP_H NOTIFICATION_POPUP_H
-#include "pluginconfig.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+# include "claws-features.h"
+#endif
#ifdef NOTIFICATION_POPUP
More information about the Commits
mailing list