From 64977cb1bcc55bf4c7c0fc38cd3d047b1e6a25c6 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@src.gnome.org>
Date: Thu, 19 Apr 2007 18:53:33 +0000
Subject: Massive code cleanup (bug #429422)

svn path=/trunk/; revision=33432
---
 calendar/gui/e-memos.c | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

(limited to 'calendar/gui/e-memos.c')

diff --git a/calendar/gui/e-memos.c b/calendar/gui/e-memos.c
index 89c0f147a4..e87761974d 100644
--- a/calendar/gui/e-memos.c
+++ b/calendar/gui/e-memos.c
@@ -27,7 +27,9 @@
 #include <config.h>
 #endif
 
+#include <string.h>
 #include <gnome.h>
+#include <glib/gi18n.h>
 #include <libgnomevfs/gnome-vfs-ops.h>
 #include <libedataserver/e-time-utils.h>
 #include <table/e-table-scrolled.h>
@@ -501,7 +503,7 @@ e_memos_class_init (EMemosClass *klass)
 				GTK_RUN_LAST,
 				G_TYPE_FROM_CLASS (object_class), 
 				GTK_SIGNAL_OFFSET (EMemosClass, selection_changed),
-				gtk_marshal_NONE__INT,
+				g_cclosure_marshal_VOID__INT,
 				GTK_TYPE_NONE, 1,
 				GTK_TYPE_INT);
 
@@ -715,15 +717,23 @@ static void
 backend_error_cb (ECal *client, const char *message, gpointer data)
 {
 	EMemos *memos;
+	GtkWidget *dialog;
 	char *errmsg;
 	char *urinopwd;
 
 	memos = E_MEMOS (data);
 
 	urinopwd = get_uri_without_password (e_cal_get_uri (client));
-	errmsg = g_strdup_printf (_("Error on %s:\n %s"), urinopwd, message);
-	gnome_error_dialog_parented (errmsg, GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (memos))));
-	g_free (errmsg);
+
+	dialog = gtk_message_dialog_new (
+		GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (memos))),
+		GTK_DIALOG_DESTROY_WITH_PARENT,
+		GTK_MESSAGE_ERROR,
+		GTK_BUTTONS_OK,
+		_("Error on %s:\n %s"), urinopwd, message);
+	gtk_dialog_run (GTK_DIALOG (dialog));
+	gtk_widget_destroy (dialog);
+
 	g_free (urinopwd);
 }
 
-- 
cgit v1.2.3