[evolution-patches] patch for alarm dialog

[Rodrigo Moya <rodrigo ximian com>]

This patch removed the ugly extra space that was being used by the 2
unused labels.

? gui/alarm-notify/alarm-notify.gladep
? gui/dialogs/alarm-options.gladep
? gui/dialogs/alarm-page.gladep
? gui/dialogs/cal-prefs-dialog.gladep
? gui/dialogs/e-delegate-dialog.gladep
? gui/dialogs/event-page.gladep
? gui/dialogs/meeting-page.gladep
? gui/dialogs/recurrence-page.gladep
? gui/dialogs/schedule-page.gladep
? gui/dialogs/task-details-page.gladep
? gui/dialogs/task-page.gladep
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/calendar/ChangeLog,v
retrieving revision 1.1738
diff -u -p -r1.1738 ChangeLog
--- ChangeLog	17 Apr 2003 15:39:47 -0000	1.1738
+++ ChangeLog	17 Apr 2003 17:19:17 -0000
@@ -1,5 +1,13 @@
 2003-04-17  Rodrigo Moya <rodrigo ximian com>
 
+	* gui/alarm-notify/alarm-notify.glade: removed 'heading' and
+	'message' labels.
+
+	* gui/alarm-notify/alarm-notify-dialog.c: removed deleted widgets.
+	(alarm_notify_dialog): don't load the removed widgets.
+
+2003-04-17  Rodrigo Moya <rodrigo ximian com>
+
 	Fixes #34498
 
 	* gui/alarm-notify/alarm-queue.c: added a 'uid' field to the
Index: gui/alarm-notify/alarm-notify-dialog.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/alarm-notify/alarm-notify-dialog.c,v
retrieving revision 1.20
diff -u -p -r1.20 alarm-notify-dialog.c
--- gui/alarm-notify/alarm-notify-dialog.c	6 Mar 2003 12:21:49 -0000	1.20
+++ gui/alarm-notify/alarm-notify-dialog.c	17 Apr 2003 17:19:17 -0000
@@ -52,8 +52,6 @@ typedef struct {
 	GtkWidget *close;
 	GtkWidget *snooze;
 	GtkWidget *edit;
-	GtkWidget *heading;
-	GtkWidget *message;
 	GtkWidget *snooze_time;
 	GtkWidget *html;
 
@@ -344,12 +342,10 @@ alarm_notify_dialog (time_t trigger, tim
 	an->close = glade_xml_get_widget (an->xml, "close");
 	an->snooze = glade_xml_get_widget (an->xml, "snooze");
 	an->edit = glade_xml_get_widget (an->xml, "edit");
-	an->heading = glade_xml_get_widget (an->xml, "heading");
-	an->message = glade_xml_get_widget (an->xml, "message");
 	an->snooze_time = glade_xml_get_widget (an->xml, "snooze-time");
 	an->html = g_object_get_data (G_OBJECT (glade_xml_get_widget (an->xml, "frame")), "html");
 
-	if (!(an->dialog && an->close && an->snooze && an->edit && an->heading && an->message
+	if (!(an->dialog && an->close && an->snooze && an->edit
 	      && an->snooze_time)) {
 		g_message ("alarm_notify_dialog(): Could not find all widgets in Glade file!");
 		g_object_unref (an->xml);
Index: gui/alarm-notify/alarm-notify.glade
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/alarm-notify/alarm-notify.glade,v
retrieving revision 1.7
diff -u -p -r1.7 alarm-notify.glade
--- gui/alarm-notify/alarm-notify.glade	16 Apr 2003 20:31:07 -0000	1.7
+++ gui/alarm-notify/alarm-notify.glade	17 Apr 2003 17:19:17 -0000
@@ -33,48 +33,6 @@
 	      <property name="spacing">6</property>
 
 	      <child>
-		<widget class="GtkLabel" id="heading">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes"></property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">True</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="message">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes"></property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">True</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
 		<widget class="Custom" id="frame">
 		  <property name="visible">True</property>
 		  <property name="creation_function">make_html_display</property>