From 0858bd319cbc5450e270ae91af05f3205e11a8c0 Mon Sep 17 00:00:00 2001
From: Not Zed <NotZed@Ximian.com>
Date: Wed, 24 Aug 2005 03:12:29 +0000
Subject: forward-define e_plugin_lib_enable, remove some unecessary headers.

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.

svn path=/trunk/; revision=30223
---
 plugins/new-mail-notify/ChangeLog         |  6 ++++++
 plugins/new-mail-notify/new-mail-notify.c | 11 +++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'plugins')

diff --git a/plugins/new-mail-notify/ChangeLog b/plugins/new-mail-notify/ChangeLog
index 043f38e422..98b6014166 100644
--- a/plugins/new-mail-notify/ChangeLog
+++ b/plugins/new-mail-notify/ChangeLog
@@ -1,3 +1,9 @@
+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)
diff --git a/plugins/new-mail-notify/new-mail-notify.c b/plugins/new-mail-notify/new-mail-notify.c
index dba602acf0..34b4fd95e0 100644
--- a/plugins/new-mail-notify/new-mail-notify.c
+++ b/plugins/new-mail-notify/new-mail-notify.c
@@ -25,11 +25,8 @@
 
 #include <string.h>
 #include <glib.h>
-#include <gtk/gtk.h>
-#include <libgnome/gnome-i18n.h>
 #include <gconf/gconf-client.h>
 #include <e-util/e-config.h>
-#include <mail/em-config.h>
 #include <mail/em-event.h>
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-lowlevel.h>
@@ -38,7 +35,6 @@
 #define DBUS_PATH "/org/gnome/evolution/mail/newmail"
 #define DBUS_INTERFACE "org.gnome.evolution.mail.dbus.Signal"
 
-GtkWidget *org_gnome_new_mail_config (EPlugin *ep, EConfigHookItemFactoryData *hook_data);
 void org_gnome_new_mail_notify (EPlugin *ep, EMEventTargetFolder *t);
 void org_gnome_message_reading_notify (EPlugin *ep, EMEventTargetMessage *t);
 
@@ -49,9 +45,6 @@ send_dbus_message (const char *message_name, const char *data)
 {
 	DBusMessage *message;
 
-	if (bus == NULL)
-		return;
-
 	/* Create a new message on the DBUS_INTERFACE */
 	message = dbus_message_new_signal (DBUS_PATH,
 					   DBUS_INTERFACE,
@@ -90,6 +83,8 @@ org_gnome_new_mail_notify (EPlugin *ep, EMEventTargetFolder *t)
 	send_dbus_message ("Newmail", t->uri);
 }
 
+int e_plugin_lib_enable (EPluginLib *ep, int enable);
+
 int
 e_plugin_lib_enable (EPluginLib *ep, int enable)
 {
@@ -104,7 +99,7 @@ e_plugin_lib_enable (EPluginLib *ep, int enable)
 			/* Could not determine address of the D-BUS session bus */
 			/* Plugin will be disabled */
 			dbus_error_free (&error);
-			return 1;
+			return -1;
 		}
 
 		/* Set up this connection to work in a GLib event loop  */
-- 
cgit