evolution r36066 - branches/mail-dbus-remoting/mail

[sragavan svn gnome org]

Author: sragavan
Date: Tue Aug 26 04:50:35 2008
New Revision: 36066
URL: http://svn.gnome.org/viewvc/evolution?rev=36066&view=rev

Log:
Fix compiler warnings


Added:
   branches/mail-dbus-remoting/mail/mail-session-remote-impl.h
Modified:
   branches/mail-dbus-remoting/mail/dbind-any.c
   branches/mail-dbus-remoting/mail/mail-component.c
   branches/mail-dbus-remoting/mail/mail-dbus.c
   branches/mail-dbus-remoting/mail/mail-dbus.h
   branches/mail-dbus-remoting/mail/mail-session-remote-impl.c
   branches/mail-dbus-remoting/mail/mail-session-remote.c

Modified: branches/mail-dbus-remoting/mail/dbind-any.c
==============================================================================
--- branches/mail-dbus-remoting/mail/dbind-any.c	(original)
+++ branches/mail-dbus-remoting/mail/dbind-any.c	Tue Aug 26 04:50:35 2008
@@ -37,7 +37,7 @@
 }
 
 /* gather immediate allocation information for this type */
-size_t dbind_gather_alloc_info_r (char **type)
+static size_t dbind_gather_alloc_info_r (char **type)
 {
     char t = **type;
     (*type)++;
@@ -364,7 +364,6 @@
 static void
 dbind_any_free_r (char **type, void **data)
 {
-    size_t len;
 
 #ifdef DEBUG
     fprintf (stderr, "any free '%c' to %p\n", **type, *data);
@@ -389,7 +388,7 @@
         int i;
         GArray *vals = **(void ***)data;
         size_t elem_size, elem_align;
-        char *saved_child_type, *child_type_string;
+        char *saved_child_type;
 
         (*type)++;
         saved_child_type = *type;

Modified: branches/mail-dbus-remoting/mail/mail-component.c
==============================================================================
--- branches/mail-dbus-remoting/mail/mail-component.c	(original)
+++ branches/mail-dbus-remoting/mail/mail-component.c	Tue Aug 26 04:50:35 2008
@@ -91,6 +91,8 @@
 #include <bonobo/bonobo-control.h>
 #include <bonobo/bonobo-widget.h>
 
+#include "mail-dbus.h"
+
 #define d(x)
 
 static void create_local_item_cb(EUserCreatableItemsHandler *handler, const char *item_type_name, void *data);

Modified: branches/mail-dbus-remoting/mail/mail-dbus.c
==============================================================================
--- branches/mail-dbus-remoting/mail/mail-dbus.c	(original)
+++ branches/mail-dbus-remoting/mail/mail-dbus.c	Tue Aug 26 04:50:35 2008
@@ -5,6 +5,7 @@
 
 #include <stdio.h>
 #include "mail-dbus.h"
+#include "mail-session-remote-impl.h"
 
 #define d(x) x
 #define DBUS_BUS_NAME "org.gnome.evolution.camel"
@@ -17,7 +18,7 @@
 /* FIXME: This is from dbus internal file */
 #define DBUS_SESSION_BUS_DEFAULT_ADDRESS	"autolaunch:"
 
-char *
+static const char *
 get_session_address ()
 {
 	const char *address = g_getenv ("DBUS_SESSION_BUS_ADDRESS");
@@ -125,7 +126,6 @@
 	guint8 *digest;
 	gsize length;
 	int state = 0, save = 0;
-	char *tmp;
 	char *buffer = g_malloc0(sizeof(char)*9);
 	int i;
 
@@ -157,7 +157,6 @@
 	guint8 *digest;
 	gsize length;
 	int state = 0, save = 0;
-	char *tmp;
 	char *buffer = g_malloc0(sizeof(char)*9);
 	int i;
 
@@ -196,13 +195,15 @@
 	return FALSE;
 }
 
-gpointer 
+static gpointer 
 mail_dbus_run ()
 {
 
 	main_loop = g_main_loop_new (gm_ctx, FALSE);
 	inited = TRUE;
 	g_main_loop_run (main_loop);
+
+	return NULL;
 }
 
 int
@@ -217,4 +218,6 @@
 	/* FIXME: This is a hack and should be fixed well. It maynot work always */
 	while (!inited)
 		g_main_context_iteration (NULL, TRUE);
+
+	return 0;
 }

Modified: branches/mail-dbus-remoting/mail/mail-dbus.h
==============================================================================
--- branches/mail-dbus-remoting/mail/mail-dbus.h	(original)
+++ branches/mail-dbus-remoting/mail/mail-dbus.h	Tue Aug 26 04:50:35 2008
@@ -14,3 +14,8 @@
 void e_dbus_connection_close (void);
 
 int e_dbus_setup_handlers (void);
+char * e_dbus_get_store_hash (const char *store_url);
+
+char * e_dbus_get_folder_hash (const char *store_url, const char *folder_name);
+
+int mail_dbus_init(void);

Modified: branches/mail-dbus-remoting/mail/mail-session-remote-impl.c
==============================================================================
--- branches/mail-dbus-remoting/mail/mail-session-remote-impl.c	(original)
+++ branches/mail-dbus-remoting/mail/mail-session-remote-impl.c	Tue Aug 26 04:50:35 2008
@@ -3,13 +3,14 @@
  *
  * */
 
+#include <string.h>
 #include <glib.h>
 #include <dbus/dbus.h>
 #include "mail-dbus.h"
 /* Lets load the actual session. */
 #define MAIL_SESSION_REMOTE_H
 #include "mail-session.h"
-
+#include "mail-session-remote-impl.h"
 #define MAIL_SESSION_OBJECT_PATH "/org/gnome/evolution/camel/session/mail"
 
 #define d(x) x
@@ -102,13 +103,9 @@
 		d(printf("%s: %s\n", method, key));
 		mail_session_forget_password (key);
 	} else if (strcmp(method, "mail_session_flush_filter_log") == 0) {
-		gboolean ret;
-
 		d(printf("%s\n", method));
 		mail_session_flush_filter_log ();
 	} else if (strcmp(method, "mail_session_shutdown") == 0) {
-		gboolean ret;
-
 		d(printf("%s\n", method));
 		mail_session_shutdown ();
 	} 

Added: branches/mail-dbus-remoting/mail/mail-session-remote-impl.h
==============================================================================
--- (empty file)
+++ branches/mail-dbus-remoting/mail/mail-session-remote-impl.h	Tue Aug 26 04:50:35 2008
@@ -0,0 +1,14 @@
+/*  
+ * Authors: Srinivasa Ragavan <sragavan novell com>
+ *
+ * */
+
+
+#ifndef MAIL_SESSION_REMOTE_IMPL_H
+#define MAIL_SESSION_REMOTE_IMPL_H
+
+
+void
+mail_session_remote_impl_init (void);
+
+#endif

Modified: branches/mail-dbus-remoting/mail/mail-session-remote.c
==============================================================================
--- branches/mail-dbus-remoting/mail/mail-session-remote.c	(original)
+++ branches/mail-dbus-remoting/mail/mail-session-remote.c	Tue Aug 26 04:50:35 2008
@@ -3,7 +3,12 @@
  *
  * */
 
+#include <stdio.h>
+#include <glib.h>
+#include "dbind.h"
 #include <mail-dbus.h>
+#include "evo-dbus.h"
+#include "mail-session-remote.h"
 
 #define MAIL_SESSION_INTERFACE	"org.gnome.evolution.camel.session.mail"
 #define MAIL_SESSION_OBJECT_PATH "/org/gnome/evolution/camel/session/mail"