From 415efc9901808bf6013daaa1d821b1ff013c6b46 Mon Sep 17 00:00:00 2001
From: Rodrigo Moya <rodrigo@ximian.com>
Date: Tue, 5 Nov 2002 13:49:19 +0000
Subject: use libxml2 headers.

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

	* pcs/cal-backend.c: use libxml2 headers.

	* gui/alarm-notify/Makefile.am:
	* gui/dialogs/Makefile.am:
	* gui/Makefile.am: s/XML_I18N/INTLTOOL. Fixed execution of
	$(ORBIT_IDL).

	* gui/alarm-notify/alarm-notify.[ch]: converted to BonoboObject.

	* gui/alarm-notify/alarm-notify-dialog.c: compilation fixes.
	(alarm_notify_dialog): adapted to new glade_xml_new signature.

	* gui/alarm-notify/alarm-queue.c: ported to BonoboActivation and
	GtkStock and GtkDialog.

	* gui/alarm-notify/notify-main.c: ported to BonoboActivation and
	use GObject functions instead of GtkObject ones.

	* gui/alarm-notify/save.h: removed BonoboConfig related functions.

	* gui/alarm-notify/config-data.c: use GObject functions instead of
	GtkObject ones.

	* TODO.port: added file for keeping track of disabled things while we
	port.

svn path=/trunk/; revision=18550
---
 calendar/gui/alarm-notify/alarm-notify-dialog.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'calendar/gui/alarm-notify/alarm-notify-dialog.c')

diff --git a/calendar/gui/alarm-notify/alarm-notify-dialog.c b/calendar/gui/alarm-notify/alarm-notify-dialog.c
index 2ad6783cf9..46d6eca39e 100644
--- a/calendar/gui/alarm-notify/alarm-notify-dialog.c
+++ b/calendar/gui/alarm-notify/alarm-notify-dialog.c
@@ -26,13 +26,13 @@
 #include <gtk/gtkspinbutton.h>
 #include <gtk/gtksignal.h>
 #include <gtk/gtkwindow.h>
-#include <libgnome/gnome-defs.h>
 #include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-winhints.h>
+#if 0 
+#  include <libgnomeui/gnome-winhints.h>
+#endif
 #include <libgnomeui/gnome-window-icon.h>
 #include <glade/glade.h>
 #include <e-util/e-time-utils.h>
-#include <gal/util/e-unicode-i18n.h>
 #include <gal/widgets/e-unicode.h>
 #include <gal/widgets/e-scroll-frame.h>
 #include <gtkhtml/gtkhtml.h>
@@ -213,9 +213,9 @@ static void
 write_times (GtkHTMLStream *stream, char *start, char *end)
 {
 	if (start)
-		gtk_html_stream_printf (stream, "<b>%s</b> %s<br>", U_("Starting:"), start);
+		gtk_html_stream_printf (stream, "<b>%s</b> %s<br>", _("Starting:"), start);
 	if (end)
-		gtk_html_stream_printf (stream, "<b>%s</b> %s<br>", U_("Ending:"), end);
+		gtk_html_stream_printf (stream, "<b>%s</b> %s<br>", _("Ending:"), end);
 
 }
 
@@ -273,7 +273,7 @@ write_html_heading (GtkHTMLStream *stream, const char *message,
 				"</TABLE>",
 				bg_path,
 				image_path,
-				U_("Evolution Alarm"));
+				_("Evolution Alarm"));
 
 	gtk_html_stream_printf (stream, "<br><br><font size=\"+2\">%s</font><br><br>", message);
 
@@ -335,7 +335,7 @@ alarm_notify_dialog (time_t trigger, time_t occur_start, time_t occur_end,
 	an->func = func;
 	an->func_data = func_data;
 
-	an->xml = glade_xml_new (EVOLUTION_GLADEDIR "/alarm-notify.glade", NULL);
+	an->xml = glade_xml_new (EVOLUTION_GLADEDIR "/alarm-notify.glade", NULL, NULL);
 	if (!an->xml) {
 		g_message ("alarm_notify_dialog(): Could not load the Glade XML file!");
 		g_free (an);
@@ -402,9 +402,11 @@ alarm_notify_dialog (time_t trigger, time_t occur_start, time_t occur_end,
 	if (!GTK_WIDGET_REALIZED (an->dialog))
 		gtk_widget_realize (an->dialog);
 
+#if 0
 	gnome_win_hints_set_state (an->dialog, WIN_STATE_STICKY);
 	gnome_win_hints_set_layer (an->dialog, WIN_LAYER_ONTOP);
 	gnome_window_icon_set_from_file (GTK_WINDOW (an->dialog), EVOLUTION_ICONSDIR "/alarm.png");
+#endif
 
 	gtk_widget_show (an->dialog);
 	return TRUE;
-- 
cgit v1.2.3