** Fix for bug #492702

2008-01-09  Srinivasa Ragavan  <sragavan@novell.com>

	** Fix for bug #492702

	* configure.in: Just disable the dbus message part of mail
	notification if dbus isn't there. Also remove new-mail-notify plugin.



svn path=/trunk/; revision=34784

1 files changed, 0 insertions, 170 deletions

diff --git a/plugins/new-mail-notify/new-mail-notify.c b/plugins/new-mail-notify/new-mail-notify.c
deleted file mode 100644
index 139838b64a..0000000000
--- a/plugins/new-mail-notify/new-mail-notify.c
+++ /dev/null
@@ -1,170 +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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <string.h>
-#include <glib.h>
-#include <gconf/gconf-client.h>
-#include <e-util/e-config.h>
-#include <mail/em-utils.h>
-#include <mail/em-event.h>
-#include <dbus/dbus-glib.h>
-#include <dbus/dbus-glib-lowlevel.h>
-#include <camel/camel-folder.h>
-
-#define DBUS_PATH "/org/gnome/evolution/mail/newmail"
-#define DBUS_INTERFACE "org.gnome.evolution.mail.dbus.Signal"
-
-int e_plugin_lib_enable (EPluginLib *ep, int enable);
-void org_gnome_new_mail_notify (EPlugin *ep, EMEventTargetFolder *t);
-void org_gnome_message_reading_notify (EPlugin *ep, EMEventTargetMessage *t);
-
-static gboolean init_dbus (void);
-
-static DBusConnection *bus = NULL;
-static gboolean enabled = FALSE;
-
-static void
-send_dbus_message (const char *name, const char *data, guint new)
-{
-	DBusMessage *message;
-
-	/* Create a new message on the DBUS_INTERFACE */
-	if (!(message = dbus_message_new_signal (DBUS_PATH, DBUS_INTERFACE, name)))
-		return;
-
-	/* Appends the data as an argument to the message */
-	dbus_message_append_args (message,
-#if DBUS_VERSION >= 310
-				  DBUS_TYPE_STRING, &data,
-#else
-				  DBUS_TYPE_STRING, data,
-#endif
-				  DBUS_TYPE_INVALID);
-
-	if (new) {
-		char * display_name = em_utils_folder_name_from_uri(data);
-		dbus_message_append_args (message,
-#if DBUS_VERSION >= 310
-					  DBUS_TYPE_STRING, &display_name, DBUS_TYPE_UINT32, &new,
-#else
-					  DBUS_TYPE_STRING, display_name, DBUS_TYPE_UINT32, new,
-#endif
-					  DBUS_TYPE_INVALID);
-
-	}
-
-	/* Sends the message */
-	dbus_connection_send (bus, message, NULL);
-
-	/* Frees the message */
-	dbus_message_unref (message);
-}
-
-void
-org_gnome_message_reading_notify (EPlugin *ep, EMEventTargetMessage *t)
-{
-	if (bus != NULL)
-		send_dbus_message ("MessageReading", t->folder->name, 0);
-}
-
-void
-org_gnome_new_mail_notify (EPlugin *ep, EMEventTargetFolder *t)
-{
-	if (bus != NULL)
-		send_dbus_message ("Newmail", t->uri, t->new);
-}
-
-
-static gboolean
-reinit_dbus (gpointer user_data)
-{
-	if (!enabled || init_dbus ())
-		return FALSE;
-
-	/* keep trying to re-establish dbus connection */
-
-	return TRUE;
-}
-
-static DBusHandlerResult
-filter_function (DBusConnection *connection, DBusMessage *message, void *user_data)
-{
-	if (dbus_message_is_signal (message, DBUS_INTERFACE_LOCAL, "Disconnected") &&
-	    strcmp (dbus_message_get_path (message), DBUS_PATH_LOCAL) == 0) {
-		dbus_connection_unref (bus);
-		bus = NULL;
-
-		g_timeout_add (3000, reinit_dbus, NULL);
-
-		return DBUS_HANDLER_RESULT_HANDLED;
-	}
-
-	return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-}
-
-static gboolean
-init_dbus (void)
-{
-	DBusError error;
-
-	if (bus != NULL)
-		return TRUE;
-
-	dbus_error_init (&error);
-	if (!(bus = dbus_bus_get (DBUS_BUS_SESSION, &error))) {
-		g_warning ("could not get system bus: %s\n", error.message);
-		dbus_error_free (&error);
-		return FALSE;
-	}
-
-	dbus_connection_setup_with_g_main (bus, NULL);
-	dbus_connection_set_exit_on_disconnect (bus, FALSE);
-
-	dbus_connection_add_filter (bus, filter_function, NULL, NULL);
-
-	return TRUE;
-}
-
-
-int
-e_plugin_lib_enable (EPluginLib *ep, int enable)
-{
-	if (enable) {
-		if (!init_dbus ())
-			return -1;
-
-		enabled = TRUE;
-	} else {
-		if (bus != NULL) {
-			dbus_connection_unref (bus);
-			bus = NULL;
-		}
-
-		enabled = FALSE;
-	}
-
-	return 0;
-}
-