aboutsummaryrefslogtreecommitdiffstats
path: root/shell/e-corba-storage.c
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2002-11-02 16:25:03 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2002-11-02 16:25:03 +0800
commit9c73777f2268b5bf2622f893e2a3ba7d0f720572 (patch)
treef81b79f19b87f84b4429d329b3fc0f9ff7946060 /shell/e-corba-storage.c
parent236c15d106b4e740d4e3996e0649334ca8e13876 (diff)
downloadgsoc2013-evolution-9c73777f2268b5bf2622f893e2a3ba7d0f720572.tar.gz
gsoc2013-evolution-9c73777f2268b5bf2622f893e2a3ba7d0f720572.tar.zst
gsoc2013-evolution-9c73777f2268b5bf2622f893e2a3ba7d0f720572.zip
First big sync of my GNOME 2 porting work (incomplete, and still
pretty broken). Weeeeee! svn path=/trunk/; revision=18503
Diffstat (limited to 'shell/e-corba-storage.c')
-rw-r--r--shell/e-corba-storage.c19
1 files changed, 13 insertions, 6 deletions
diff --git a/shell/e-corba-storage.c b/shell/e-corba-storage.c
index 31e8c424f1..e90411b7d9 100644
--- a/shell/e-corba-storage.c
+++ b/shell/e-corba-storage.c
@@ -35,9 +35,12 @@
#include <bonobo/bonobo-main.h>
#include <bonobo/bonobo-exception.h>
+#include <bonobo/bonobo-listener.h>
#include <gdk/gdkx.h>
+#include <string.h>
+
#define PARENT_TYPE E_TYPE_STORAGE
static EStorageClass *parent_class = NULL;
@@ -285,8 +288,10 @@ struct async_folder_closure {
};
static void
-async_folder_cb (BonoboListener *listener, char *event_name,
- CORBA_any *any, CORBA_Environment *ev,
+async_folder_cb (BonoboListener *listener,
+ const char *event_name,
+ const CORBA_any *any,
+ CORBA_Environment *ev,
gpointer user_data)
{
struct async_folder_closure *closure = user_data;
@@ -506,8 +511,10 @@ supports_shared_folders (EStorage *storage)
}
static void
-async_folder_discovery_cb (BonoboListener *listener, char *event_name,
- CORBA_any *any, CORBA_Environment *ev,
+async_folder_discovery_cb (BonoboListener *listener,
+ const char *event_name,
+ const CORBA_any *any,
+ CORBA_Environment *ev,
gpointer user_data)
{
struct async_folder_closure *closure = user_data;
@@ -582,7 +589,7 @@ cancel_discover_shared_folder (EStorage *storage,
GNOME_Evolution_Storage_cancelDiscoverSharedFolder (priv->storage_interface,
owner, folder_name, &ev);
if (BONOBO_EX (&ev))
- g_warning ("Error invoking cancelDiscoverSharedFolder -- %s", BONOBO_EX_ID (&ev));
+ g_warning ("Error invoking cancelDiscoverSharedFolder -- %s", BONOBO_EX_REPOID (&ev));
CORBA_exception_free (&ev);
}
@@ -829,7 +836,7 @@ e_corba_storage_show_folder_properties (ECorbaStorage *corba_storage,
GDK_WINDOW_XWINDOW (parent_window),
&ev);
if (BONOBO_EX (&ev))
- g_warning ("Error in Storage::showFolderProperties -- %s", BONOBO_EX_ID (&ev));
+ g_warning ("Error in Storage::showFolderProperties -- %s", BONOBO_EX_REPOID (&ev));
CORBA_exception_free (&ev);
}