aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/Mail.idl6
-rw-r--r--mail/Makefile.am4
-rw-r--r--mail/folder-browser-factory.c15
-rw-r--r--mail/folder-browser.c6
-rw-r--r--mail/folder-browser.h2
-rw-r--r--mail/mail-component.c2
-rw-r--r--mail/main.c4
-rw-r--r--mail/message-list.c22
-rw-r--r--mail/message-list.h10
9 files changed, 36 insertions, 35 deletions
diff --git a/mail/Mail.idl b/mail/Mail.idl
index 74c6ba74d4..1d12a39c5c 100644
--- a/mail/Mail.idl
+++ b/mail/Mail.idl
@@ -7,11 +7,11 @@
* (C) 2000 Helix Code, Inc.
*/
-#include <bonobo.idl>
+#include <Bonobo.idl>
module Evolution {
- interface MessageList : GNOME::Unknown {
+ interface MessageList : Bonobo::Unknown {
void select_message (in long message_number);
void open_message (in long message_number);
@@ -23,7 +23,7 @@ module Evolution {
* configuration of this widget is done trough
* Bonobo Properties
*/
- interface FolderBrowser : GNOME::Unknown {
+ interface FolderBrowser : Bonobo::Unknown {
MessageList get_message_list ();
};
};
diff --git a/mail/Makefile.am b/mail/Makefile.am
index fa903d89d9..98421cc6d4 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -8,7 +8,7 @@ INCLUDES = \
-I$(srcdir)/../widgets \
$(BONOBO_HTML_GNOME_CFLAGS)
-EVOLUTION_CORBA_GENERATED = \
+EVOLUTION_MAIL_CORBA_GENERATED = \
Mail.h \
Mail-common.c \
Mail-skels.c \
@@ -24,7 +24,7 @@ evolution_mail_SOURCES = \
main.c \
message-list.c \
message-list.h \
- $(EVOLUTION_CORBA_GENERATED)
+ $(EVOLUTION_MAIL_CORBA_GENERATED)
evolution_mail_LDADD = \
../widgets/e-table/libetable.a \
diff --git a/mail/folder-browser-factory.c b/mail/folder-browser-factory.c
index 0b5f9e48d9..17947b5f71 100644
--- a/mail/folder-browser-factory.c
+++ b/mail/folder-browser-factory.c
@@ -8,12 +8,13 @@
*/
#include <config.h>
#include <gnome.h>
-#include <bonobo/gnome-main.h>
-#include <bonobo/gnome-object.h>
-#include <bonobo/gnome-generic-factory.h>
+#include <bonobo/bonobo-main.h>
+#include <bonobo/bonobo-object.h>
+#include <bonobo/bonobo-generic-factory.h>
+#include "e-util/e-util.h"
-static GnomeObject *
-folder_browser_factory (GnomeGenericFactory *factory, void *closure)
+static BonoboObject *
+folder_browser_factory (BonoboGenericFactory *factory, void *closure)
{
g_error ("Fill me in!");
@@ -23,13 +24,13 @@ folder_browser_factory (GnomeGenericFactory *factory, void *closure)
void
folder_browser_factory_init (void)
{
- static GnomeGenericFactory *bonobo_folder_browser_factory = NULL;
+ static BonoboGenericFactory *bonobo_folder_browser_factory = NULL;
if (bonobo_folder_browser_factory != NULL)
return;
bonobo_folder_browser_factory =
- gnome_generic_factory_new (
+ bonobo_generic_factory_new (
"Evolution:FolderBrowser:1.0",
folder_browser_factory, NULL);
diff --git a/mail/folder-browser.c b/mail/folder-browser.c
index 63cf7566fb..880ae59a65 100644
--- a/mail/folder-browser.c
+++ b/mail/folder-browser.c
@@ -42,7 +42,7 @@ folder_browser_set_uri (FolderBrowser *folder_browser, const char *uri)
}
static void
-folder_browser_property_changed (GnomePropertyBag *properties,
+folder_browser_property_changed (BonoboPropertyBag *properties,
const char *name,
const char *type,
gpointer old_value,
@@ -62,9 +62,9 @@ folder_browser_init (GtkObject *object)
{
FolderBrowser *fb = FOLDER_BROWSER (object);
- fb->properties = gnome_property_bag_new ();
+ fb->properties = bonobo_property_bag_new ();
- gnome_property_bag_add (
+ bonobo_property_bag_add (
fb->properties, PROPERTY_FOLDER_URI, "string",
NULL, NULL, _("The URI that the Folder Browser will display", 0);
diff --git a/mail/folder-browser.h b/mail/folder-browser.h
index a81585e3ab..b3355518f7 100644
--- a/mail/folder-browser.h
+++ b/mail/folder-browser.h
@@ -13,7 +13,7 @@
typedef struct {
GtkTable parent;
- GnomePropertyBag *properties;
+ BonoboPropertyBag *properties;
/*
* The current URI being displayed by the FolderBrowser
diff --git a/mail/mail-component.c b/mail/mail-component.c
index 764be4be38..d1fca42e65 100644
--- a/mail/mail-component.c
+++ b/mail/mail-component.c
@@ -8,7 +8,7 @@
*/
#include <config.h>
#include <gnome.h>
-#include <bonobo/gnome-main.h>
+#include <bonobo/bonobo-main.h>
#include "e-util/e-gui-utils.h"
CORBA_Environment ev;
diff --git a/mail/main.c b/mail/main.c
index dc3ff752fd..517d6190e2 100644
--- a/mail/main.c
+++ b/mail/main.c
@@ -9,7 +9,7 @@
#include <config.h>
#include <gnome.h>
#include <libgnorba/gnorba.h>
-#include <bonobo/gnome-main.h>
+#include <bonobo/bonobo-main.h>
#include "e-util/e-gui-utils.h"
#include "main.h"
@@ -32,7 +32,7 @@ init_bonobo (int argc, char **argv)
}
}
-void
+int
main (int argc, char *argv [])
{
bindtextdomain (PACKAGE, EVOLUTION_LOCALEDIR);
diff --git a/mail/message-list.c b/mail/message-list.c
index f7c54bea04..7b7683ced0 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -9,7 +9,7 @@
*/
#include <config.h>
#include <gnome.h>
-#include <bonobo/gnome-main.h>
+#include <bonobo/bonobo-main.h>
#include "camel/camel-folder.h"
#include "e-table/e-table.h"
#include "e-table/e-table-simple.h"
@@ -40,9 +40,9 @@
#define COL_SIZE_WIDTH N_CHARS(6)
#define COL_SIZE_WIDTH_MIN 32
-#define PARENT_TYPE (gnome_object_get_type ())
+#define PARENT_TYPE (bonobo_object_get_type ())
-static GnomeObjectClass *message_list_parent_class;
+static BonoboObjectClass *message_list_parent_class;
static POA_Evolution_MessageList__vepv evolution_message_list_vepv;
/*
@@ -303,7 +303,7 @@ evolution_message_list_get_epv (void)
static void
message_list_corba_class_init (void)
{
- evolution_message_list_vepv.GNOME_Unknown_epv = gnome_object_get_epv ();
+ evolution_message_list_vepv.Bonobo_Unknown_epv = bonobo_object_get_epv ();
evolution_message_list_vepv.Evolution_MessageList_epv = evolution_message_list_get_epv ();
}
@@ -323,16 +323,16 @@ message_list_class_init (GtkObjectClass *object_class)
static void
message_list_construct (MessageList *message_list, Evolution_MessageList corba_message_list)
{
- gnome_object_construct (GNOME_OBJECT (message_list), corba_message_list);
+ bonobo_object_construct (BONOBO_OBJECT (message_list), corba_message_list);
}
static Evolution_MessageList
-create_corba_message_list (GnomeObject *object)
+create_corba_message_list (BonoboObject *object)
{
POA_Evolution_MessageList *servant;
CORBA_Environment ev;
- servant = (POA_Evolution_MessageList *) g_new0 (GnomeObjectServant, 1);
+ servant = (POA_Evolution_MessageList *) g_new0 (BonoboObjectServant, 1);
servant->vepv = &evolution_message_list_vepv;
CORBA_exception_init (&ev);
@@ -344,10 +344,10 @@ create_corba_message_list (GnomeObject *object)
}
CORBA_exception_free (&ev);
- return (Evolution_MessageList) gnome_object_activate_servant (object, servant);
+ return (Evolution_MessageList) bonobo_object_activate_servant (object, servant);
}
-GnomeObject *
+BonoboObject *
message_list_new (void)
{
Evolution_MessageList corba_object;
@@ -355,7 +355,7 @@ message_list_new (void)
message_list = gtk_type_new (message_list_get_type ());
- corba_object = create_corba_message_list (GNOME_OBJECT (message_list));
+ corba_object = create_corba_message_list (BONOBO_OBJECT (message_list));
if (corba_object == CORBA_OBJECT_NIL){
gtk_object_destroy (GTK_OBJECT (message_list));
return NULL;
@@ -363,7 +363,7 @@ message_list_new (void)
message_list_construct (message_list, corba_object);
- return GNOME_OBJECT (message_list);
+ return BONOBO_OBJECT (message_list);
}
void
diff --git a/mail/message-list.h b/mail/message-list.h
index 44ba575a51..ee1233e922 100644
--- a/mail/message-list.h
+++ b/mail/message-list.h
@@ -1,8 +1,8 @@
#ifndef _MESSAGE_LIST_H_
#define _MESSAGE_LIST_H_
-#include <bonobo/gnome-main.h>
-#include <bonobo/gnome-object.h>
+#include <bonobo/bonobo-main.h>
+#include <bonobo/bonobo-object.h>
#include "camel/camel-folder.h"
#define MESSAGE_LIST_TYPE (message_list_get_type ())
@@ -29,7 +29,7 @@ enum {
};
typedef struct {
- GnomeObject parent;
+ BonoboObject parent;
ETableModel *table_model;
ETableHeader *header_model;
@@ -48,11 +48,11 @@ typedef struct {
} MessageList;
typedef struct {
- GnomeObjectClass parent_class;
+ BonoboObjectClass parent_class;
} MessageListClass;
GtkType message_list_get_type (void);
-GnomeObject *message_list_new (void);
+BonoboObject *message_list_new (void);
void message_list_set_folder (MessageList *message_list,
CamelFolder *camel_folder);
GtkWidget *message_list_get_widget (MessageList *message_list);
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 19:36:54 +0800