From 55434d946738ae03c2c841002204baa3bdd7ce1f Mon Sep 17 00:00:00 2001
From: Rodrigo Moya <rodrigo@ximian.com>
Date: Thu, 7 Nov 2002 16:18:38 +0000
Subject: converted to BonoboObject.

2002-11-07  Rodrigo Moya <rodrigo@ximian.com>

	* cal-client/query-listener.[ch]: converted to BonoboObject.

	* gui/dialogs/comp-editor-util.c (parse_contact_string): use glib's
	g_utf8_strchr.

	* gui/dialogs/delete-comp.c: removed non-existant headers. Use
	GtkStock instead of GnomeStock.

	* gui/dialogs/e-delegate-dialog.c: converted to BonoboActivation.
	(e_delegate_dialog_construct): adapted to changes in glade_xml_new.

svn path=/trunk/; revision=18632
---
 calendar/gui/dialogs/comp-editor-util.c  | 4 ++--
 calendar/gui/dialogs/delete-comp.c       | 7 +++----
 calendar/gui/dialogs/e-delegate-dialog.c | 6 +++---
 calendar/gui/dialogs/e-delegate-dialog.h | 1 -
 4 files changed, 8 insertions(+), 10 deletions(-)

(limited to 'calendar/gui')

diff --git a/calendar/gui/dialogs/comp-editor-util.c b/calendar/gui/dialogs/comp-editor-util.c
index 165cd43744..c60c416087 100644
--- a/calendar/gui/dialogs/comp-editor-util.c
+++ b/calendar/gui/dialogs/comp-editor-util.c
@@ -379,8 +379,8 @@ parse_contact_string (const char *value, char **name, char **email)
 		return;
 	}
 
-	lbracket = g_utf8_strchr (value, '<');
-	rbracket = g_utf8_strchr (value, '>');
+	lbracket = g_utf8_strchr (value, g_utf8_strlen (value, 0), '<');
+	rbracket = g_utf8_strchr (value, g_utf8_strlen (value, 0), '>');
 
 	if (!lbracket || !rbracket || rbracket < lbracket) {
 		*name = g_strdup (value);
diff --git a/calendar/gui/dialogs/delete-comp.c b/calendar/gui/dialogs/delete-comp.c
index 405a9445b4..f4606041f7 100644
--- a/calendar/gui/dialogs/delete-comp.c
+++ b/calendar/gui/dialogs/delete-comp.c
@@ -23,9 +23,8 @@
 #endif
 
 #include <glib.h>
-#include <libgnome/gnome-defs.h>
+#include <gtk/gtkstock.h>
 #include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-stock.h>
 #include <gal/widgets/e-unicode.h>
 #include "widgets/misc/e-messagebox.h"
 #include "../calendar-config.h"
@@ -151,8 +150,8 @@ delete_component_dialog (CalComponent *comp,
 	}
 
 	dialog = e_message_box_new (str, E_MESSAGE_BOX_QUESTION,
-				    GNOME_STOCK_BUTTON_YES,
-				    GNOME_STOCK_BUTTON_NO,
+				    GTK_STOCK_YES,
+				    GTK_STOCK_NO,
 				    NULL);
 	g_free (str);
 
diff --git a/calendar/gui/dialogs/e-delegate-dialog.c b/calendar/gui/dialogs/e-delegate-dialog.c
index d37fbce51c..c42bd3ca95 100644
--- a/calendar/gui/dialogs/e-delegate-dialog.c
+++ b/calendar/gui/dialogs/e-delegate-dialog.c
@@ -20,7 +20,7 @@
  */
 
 #include <config.h>
-#include <liboaf/liboaf.h>
+#include <bonobo-activation/bonobo-activation.h>
 #include <bonobo/bonobo-control.h>
 #include <bonobo/bonobo-exception.h>
 #include <bonobo/bonobo-widget.h>
@@ -160,7 +160,7 @@ e_delegate_dialog_construct (EDelegateDialog *edd, const char *name, const char
 	/* Load the content widgets */
 
 	priv->xml = glade_xml_new (EVOLUTION_GLADEDIR "/e-delegate-dialog.glade",
-				   NULL);
+				   NULL, NULL);
 	if (!priv->xml) {
 		g_message ("e_delegate_dialog_construct(): Could not load the Glade XML file!");
 		goto error;
@@ -173,7 +173,7 @@ e_delegate_dialog_construct (EDelegateDialog *edd, const char *name, const char
 	
 	CORBA_exception_init (&ev);
 	
-	priv->corba_select_names = oaf_activate_from_id (SELECT_NAMES_OAFID, 0, NULL, &ev);
+	priv->corba_select_names = bonobo_activation_activate_from_id (SELECT_NAMES_OAFID, 0, NULL, &ev);
 	GNOME_Evolution_Addressbook_SelectNames_addSectionWithLimit (priv->corba_select_names, 
 								     section_name, 
 								     section_name,
diff --git a/calendar/gui/dialogs/e-delegate-dialog.h b/calendar/gui/dialogs/e-delegate-dialog.h
index 311d22b4c7..dc26327241 100644
--- a/calendar/gui/dialogs/e-delegate-dialog.h
+++ b/calendar/gui/dialogs/e-delegate-dialog.h
@@ -21,7 +21,6 @@
 #ifndef __E_DELEGATE_DIALOG_H__
 #define __E_DELEGATE_DIALOG_H__
 
-#include <libgnome/gnome-defs.h>
 #include <gtk/gtkwidget.h>
 
 
-- 
cgit v1.2.3