aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog8
-rw-r--r--calendar/gui/alarm-notify/alarm-notify-dialog.c6
-rw-r--r--calendar/gui/alarm-notify/alarm-notify.glade42
3 files changed, 9 insertions, 47 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index b3a6f55e01..238dc435dc 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,11 @@
+2003-04-18 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-18 Rodney Dawes <dobey@ximian.com>
Fixes #21499
diff --git a/calendar/gui/alarm-notify/alarm-notify-dialog.c b/calendar/gui/alarm-notify/alarm-notify-dialog.c
index 2d013b4463..f128701708 100644
--- a/calendar/gui/alarm-notify/alarm-notify-dialog.c
+++ b/calendar/gui/alarm-notify/alarm-notify-dialog.c
@@ -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, time_t occur_start, time_t occur_end,
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);
diff --git a/calendar/gui/alarm-notify/alarm-notify.glade b/calendar/gui/alarm-notify/alarm-notify.glade
index 2867aa52a3..bc0da43f22 100644
--- a/calendar/gui/alarm-notify/alarm-notify.glade
+++ b/calendar/gui/alarm-notify/alarm-notify.glade
@@ -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>