aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSrinivasa Ragavan <sragavan@src.gnome.org>2007-05-03 15:59:37 +0800
committerSrinivasa Ragavan <sragavan@src.gnome.org>2007-05-03 15:59:37 +0800
commitb92eff4a79b7210ea699e6d857c6126003aa5d16 (patch)
tree9e83a492186838824a526c32f24be0d117b18f02
parent6fe8a308c7b8b9b5427702af9b0340b05725a46e (diff)
downloadgsoc2013-evolution-b92eff4a79b7210ea699e6d857c6126003aa5d16.tar
gsoc2013-evolution-b92eff4a79b7210ea699e6d857c6126003aa5d16.tar.gz
gsoc2013-evolution-b92eff4a79b7210ea699e6d857c6126003aa5d16.tar.bz2
gsoc2013-evolution-b92eff4a79b7210ea699e6d857c6126003aa5d16.tar.lz
gsoc2013-evolution-b92eff4a79b7210ea699e6d857c6126003aa5d16.tar.xz
gsoc2013-evolution-b92eff4a79b7210ea699e6d857c6126003aa5d16.tar.zst
gsoc2013-evolution-b92eff4a79b7210ea699e6d857c6126003aa5d16.zip
Revert the previous wrong commit.
svn path=/trunk/; revision=33473
-rw-r--r--plugins/new-mail-notify/ChangeLog125
-rw-r--r--plugins/new-mail-notify/Makefile.am12
-rw-r--r--plugins/new-mail-notify/mail-notification.c137
-rw-r--r--plugins/new-mail-notify/org-gnome-mail-notification.eplug.xml34
4 files changed, 126 insertions, 182 deletions
diff --git a/plugins/new-mail-notify/ChangeLog b/plugins/new-mail-notify/ChangeLog
index 39dd335414..d360c4f215 100644
--- a/plugins/new-mail-notify/ChangeLog
+++ b/plugins/new-mail-notify/ChangeLog
@@ -1,7 +1,124 @@
+2007-05-03 Srinivasa Ragavan <sragavan@novell.com>
+
+ * new-mail-notify.c (send_dbus_message),
+ (org_gnome_message_reading_notify), (org_gnome_new_mail_notify): Send
+ the number of new mails via the dbus message.
+
+2007-04-02 Sankar P <psankar@novell.com>
+
+ * Committed on behalf of Gilles Dartiguelongue <dartigug@esiee.fr>
+
+ * org-gnome-new-mail-notify.eplug.xml:
+ Cleanup.
+ Fixes part of #301149
+
2006-08-21 Srinivasa Ragavan <sragavan@novell.com>
- ** Initial commit for Mail notification plugin.
+ ** Fix for bug #308271 Patch by Johannes Berg
+
+ * new-mail-notify.c: (send_dbus_message),
+ (org_gnome_message_reading_notify), (org_gnome_new_mail_notify): Send
+ the folder name also in the message.
+
+2006-04-18 Jeffrey Stedfast <fejj@novell.com>
+
+ * new-mail-notify.c (org_gnome_message_reading_notify): Don't try
+ and send a dbus message if the bus is down.
+ (org_gnome_new_mail_notify): Same.
+ (init_dbus): New function to init the dbus connection and setup
+ handlers for when the bus gets unexpectedly disconnected.
+ (e_plugin_lib_enable): When the plugin gets disabled, unref the
+ dbus connection and reset it back to NULL.
+
+2005-08-23 Not Zed <NotZed@Ximian.com>
+
+ * new-mail-notify.c: forward-define e_plugin_lib_enable, remove
+ some unecessary headers.
+ (send_dbus_message): remove spurious check for bus==NULL.
+
+2005-07-11 Vivek Jain <jvivek@novell.com>
+
+ * new-mail-notify.c (send_dbus_message): check whether memory
+ could be allocated. Return if the message is NULL so that we don't
+ unref it again, will save crash. **Fixes #274329 sort of bugs, in
+ case reported even after david's fix.
+
+2005-05-11 Not Zed <NotZed@Ximian.com>
+
+ * Makefile.am: added built_sources/cleanfiles
+
+2005-05-06 Not Zed <NotZed@Ximian.com>
+
+ * new-mail-notify.c: make the bus connection global and keep track
+ of the gconf state directly too.
+ (org_gnome_new_mail_config): removed configuration section,
+ implicitly enabled by enabling the plugin now.
+
+2005-04-06 Timo Hoenig <thoenig@novell.com>
+
+ * new-mail-notify.c (send_dbus_message): added two checks to prevent
+ Evolution to crash if the D-BUS session bus is not running or if
+ D-BUS is not able to allocate memory for the message
+ * new-mail-notify.c (e_plugin_lib_enable): refuse to load the plugin
+ if the address of the D-BUS session bus can not be determined
+ * new-mail-notify.c (e_plugin_lib_enable): new function
+
+2005-05-06 Not Zed <NotZed@Ximian.com>
+
+ * Makefile.am:
+ * org-gnome-new-mail-notify.eplug.xml: s/.in/.xml/ & i18n.
+
+2005-03-11 David Malcolm <dmalcolm@redhat.com>
+
+ * new-mail-notify.c: preprocessor hackery using the value of
+ DBUS_VERSION to cope with changes to the semantics of
+ dbus_message_append_args
+
+ * Makefile.am: define the DBUS_VERSION in the preprocessor
+
+2005-02-24 Björn Torkelsson <torkel@acc.umu.se>
+
+ * org-gnome-new-mail-notify.eplug.in: Added id for mail preferences.
+
+2005-01-13 Not Zed <NotZed@Ximian.com>
+
+ * new-mail-notify.c: added prototypes for exported functions,
+ re-arranged slightly to staticise internal functions.
+
+ * new-mail-notify.h: removed.
+
+2005-01-12 Miguel Angel Lopez Hernandez <miguel@gulev.org.mx>
+
+ * new-mail-notify.[ch]: Fix author's name, changes in code
+ to maintain coding style
+ (org_gnome_new_mail_notify): Now sends the dbus message using
+ the send_dbus_message function
+ (org_gnome_message_reading_notify): Added function, called when
+ a message.reading event is fired
+ (send_dbus_message): Added function, generic function to send
+ dbus messages
+
+ * org-gnome-new-mail-notify.eplug.in: define the message reading
+ event
+
+2005-01-11 JP Rosevear <jpr@novell.com>
+
+ * Makefile.am: add new-mail-notify.h so it gets disted
+
+2005-01-11 Not Zed <NotZed@Ximian.com>
+
+ * new-mail-notify.c (org_gnome_new_mail_config)
+ (org_gnome_new_mail_notify): renamed slightly for
+ namespace/consistency.
+ (org_gnome_new_mail_notify): fixed signature.
+ (org_gnome_new_mail_notify): fixed some warnings & formatting.
+
+2004-12-30 Miguel Angel Lopez Hernandez <miguel@gulev.org.mx>
+
+ * new-mail-notify.[ch]: Plugin implementation
+
+ * org-gnome-new-mail-notify.eplug.in: define the
+ new mail notify plugin
+
+ * Makefile.am: build the new mail notify plugin
- * mail-notification.c:
- * Makefile.am:
- * org-gnome-mail-notification.eplug.xml:
diff --git a/plugins/new-mail-notify/Makefile.am b/plugins/new-mail-notify/Makefile.am
index 6644bf97b5..828dca52da 100644
--- a/plugins/new-mail-notify/Makefile.am
+++ b/plugins/new-mail-notify/Makefile.am
@@ -3,22 +3,20 @@ INCLUDES = \
-DDBUS_API_SUBJECT_TO_CHANGE=1 \
-DDBUS_VERSION=$(DBUS_VERSION) \
$(EVOLUTION_MAIL_CFLAGS) \
- $(LIBNOTIFY_CFLAGS)
$(NMN_CFLAGS)
LIBS = \
- $(LIBNOTIFY_LIBS) \
$(NMN_LIBS)
@EVO_PLUGIN_RULE@
-plugin_DATA = org-gnome-mail-notification.eplug
-plugin_LTLIBRARIES = liborg-gnome-mail-notification.la
+plugin_DATA = org-gnome-new-mail-notify.eplug
+plugin_LTLIBRARIES = liborg-gnome-new-mail-notify.la
-liborg_gnome_mail_notification_la_SOURCES = mail-notification.c
-liborg_gnome_mail_notification_la_LDFLAGS = -module -avoid-version
+liborg_gnome_new_mail_notify_la_SOURCES = new-mail-notify.c
+liborg_gnome_new_mail_notify_la_LDFLAGS = -module -avoid-version
-EXTRA_DIST = org-gnome-mail-notification.eplug.xml
+EXTRA_DIST = org-gnome-new-mail-notify.eplug.xml
BUILT_SOURCES = $(plugin_DATA)
CLEANFILES = $(BUILT_SOURCES)
diff --git a/plugins/new-mail-notify/mail-notification.c b/plugins/new-mail-notify/mail-notification.c
deleted file mode 100644
index 5ce66240a3..0000000000
--- a/plugins/new-mail-notify/mail-notification.c
+++ /dev/null
@@ -1,137 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Author: Miguel Angel Lopez Hernandez <miguel@gulev.org.mx>
- *
- * Copyright 2004 Novell, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * 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., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <string.h>
-#include <glib.h>
-#include <glib/gi18n.h>
-#include <gtk/gtk.h>
-#include <gconf/gconf-client.h>
-#include <e-util/e-config.h>
-#include <e-util/e-icon-factory.h>
-
-#include <mail/em-utils.h>
-#include <mail/em-event.h>
-#include <mail/em-folder-tree-model.h>
-#include <camel/camel-folder.h>
-
-#include <libnotify/notify.h>
-
-int e_plugin_lib_enable (EPluginLib *ep, int enable);
-void org_gnome_mail_new_notify (EPlugin *ep, EMEventTargetFolder *t);
-void org_gnome_mail_read_notify (EPlugin *ep, EMEventTargetMessage *t);
-
-static gboolean enabled = FALSE;
-GtkStatusIcon *status_icon = NULL;
-
-static GStaticMutex mlock = G_STATIC_MUTEX_INIT;
-
-void
-org_gnome_mail_read_notify (EPlugin *ep, EMEventTargetMessage *t)
-{
- g_static_mutex_lock (&mlock);
-
- if (!status_icon) {
- g_static_mutex_unlock (&mlock);
- return;
- }
-
- gtk_status_icon_set_visible (status_icon, FALSE);
-
- g_static_mutex_unlock (&mlock);
-
-}
-
-static void
-icon_activated (GtkStatusIcon *icon)
-{
- g_static_mutex_lock (&mlock);
- gtk_status_icon_set_visible (status_icon, FALSE);
- g_static_mutex_unlock (&mlock);
-
-}
-
-void
-org_gnome_mail_new_notify (EPlugin *ep, EMEventTargetFolder *t)
-{
- char *msg = NULL;
- char *folder;
- NotifyUrgency urgency = NOTIFY_URGENCY_NORMAL;
- long expire_timeout = NOTIFY_EXPIRES_DEFAULT;
- NotifyNotification *notify;
-
- /* FIXME: Should this is_inbox be configurable? */
- if (!t->new || !t->is_inbox)
- return;
-
- g_static_mutex_lock (&mlock);
-
- if (!status_icon) {
- status_icon = gtk_status_icon_new ();
- gtk_status_icon_set_from_pixbuf (status_icon, e_icon_factory_get_icon ("stock_mail", E_ICON_SIZE_LARGE_TOOLBAR));
- gtk_status_icon_set_blinking (status_icon, TRUE);
- }
-
- folder = em_utils_folder_name_from_uri (t->uri);
- msg = g_strdup_printf (_("You have received %d new messages in %s."), t->new, folder);
-
- gtk_status_icon_set_tooltip (status_icon, msg);
- gtk_status_icon_set_visible (status_icon, TRUE);
-
- if (!notify_init("notify-send"))
- fprintf(stderr,"notify init error");
-
- notify = notify_notification_new("New email in Evolution",
- msg,
- "stock_mail",
- NULL);
- if(notify==NULL)
- fprintf(stderr,"notify = NULL !!\n");
- else {
- notify_notification_set_urgency(notify, urgency);
- notify_notification_set_timeout(notify, expire_timeout);
- notify_notification_show(notify, NULL);
- }
-
- g_free (folder);
- g_free (msg);
- g_signal_connect (G_OBJECT (status_icon), "activate",
- G_CALLBACK (icon_activated), NULL);
- g_static_mutex_unlock (&mlock);
-}
-
-
-
-
-int
-e_plugin_lib_enable (EPluginLib *ep, int enable)
-{
- if (enable)
- enabled = TRUE;
- else
- enabled = FALSE;
-
- return 0;
-}
-
diff --git a/plugins/new-mail-notify/org-gnome-mail-notification.eplug.xml b/plugins/new-mail-notify/org-gnome-mail-notification.eplug.xml
deleted file mode 100644
index 56b9cc7c2b..0000000000
--- a/plugins/new-mail-notify/org-gnome-mail-notification.eplug.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<e-plugin-list>
- <e-plugin
- id="org.gnome.evolution.mail_notification"
- type="shlib"
- _name="Mail Notification"
- location="@PLUGINDIR@/liborg-gnome-mail-notification@SOEXT@">
-
- <_description>Notifies the user with tray icon and a notify message whenever a new message is arrived.</_description>
- <author name="Srinivasa Ragavan" email="sragavan@novell.com"/>
-
- <hook class="org.gnome.evolution.mail.events:1.0">
- <event id="folder.changed"
- enable="newmail"
- handle="org_gnome_mail_new_notify"
- target="folder"/>
- </hook>
-
- <hook class="org.gnome.evolution.mail.events:1.0">
- <event id="message.reading"
- handle="org_gnome_mail_read_notify"
- target="message"/>
- </hook>
- <!--
- <hook class="org.gnome.evolution.mail.config:1.0">
- <group id="org.gnome.evolution.mail.prefs" target="prefs">
- <item type="item"
- path="00.general/30.notify/00.new_mail_notify"
- _label="New mail notify"
- factory="org_gnome_new_mail_config"/>
- </group>
- </hook>
- -->
- </e-plugin>
-</e-plugin-list>