aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--calendar/ChangeLog18
-rw-r--r--calendar/gui/alarm-notify/alarm-queue.c7
-rw-r--r--calendar/gui/dialogs/comp-editor.c2
-rw-r--r--calendar/gui/dialogs/e-delegate-dialog.c2
-rw-r--r--calendar/gui/dialogs/meeting-page.c2
-rw-r--r--calendar/gui/dialogs/recurrence-page.c14
-rw-r--r--calendar/gui/dialogs/schedule-page.c2
-rw-r--r--calendar/gui/e-itip-control.c2
-rw-r--r--calendar/gui/e-meeting-time-sel.c22
-rw-r--r--calendar/gui/e-timezone-entry.c4
-rw-r--r--calendar/gui/gnome-cal.c4
-rw-r--r--calendar/gui/tasks-control.c4
12 files changed, 52 insertions, 31 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index e3cd63eb0a..8b72e13da6 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,21 @@
+2003-04-22 Rodrigo Moya <rodrigo@ximian.com>
+
+ Fixes part of #41148, #41216 and #41235
+
+ * gui/e-itip-control.c (init):
+ * gui/e-meeting-time-sel.c (e_meeting_time_selector_construct,
+ e_meeting_time_selector_add_key_color):
+ * gui/e-timezone-entry.c (e_timezone_entry_init):
+ * gui/gnome-cal.c (setup_widgets):
+ * gui/tasks-control.c (confirm_expunge):
+ * gui/dialogs/comp-editor.c (setup_widgets):
+ * gui/dialogs/e-delegate-dialog.c (e_delegate_dialog_construct):
+ * gui/dialogs/meeting-page.c (meeting_page_construct):
+ * gui/dialogs/recurrence-page.c (make_weekly_special,
+ make_monthly_special, make_ending_count_special):
+ * gui/dialogs/schedule-page.c (schedule_page_construct):
+ use HIG-suggested spacing.
+
2003-04-21 Rodrigo Moya <rodrigo@ximian.com>
Fixes #22444
diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c
index fa04a63daa..d6fda7d37c 100644
--- a/calendar/gui/alarm-notify/alarm-queue.c
+++ b/calendar/gui/alarm-notify/alarm-queue.c
@@ -825,9 +825,12 @@ audio_notification (time_t trigger, CompQueuedAlarms *cqa,
const char *url;
url = icalattach_get_url (attach);
- g_assert (url != NULL);
- gnome_sound_play (url); /* this sucks */
+ if (url && *url) {
+ gnome_sound_init ("localhost");
+ gnome_sound_play (url); /* this sucks */
+ } else
+ gdk_beep ();
}
if (attach)
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index a27ec7776c..70ad1abe8f 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -212,7 +212,7 @@ setup_widgets (CompEditor *editor)
priv->notebook = GTK_NOTEBOOK (gtk_notebook_new ());
gtk_widget_show (GTK_WIDGET (priv->notebook));
gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (priv->notebook),
- TRUE, TRUE, 0);
+ TRUE, TRUE, 6);
}
/* Object initialization function for the calendar component editor */
diff --git a/calendar/gui/dialogs/e-delegate-dialog.c b/calendar/gui/dialogs/e-delegate-dialog.c
index da49772f00..d9f05691f6 100644
--- a/calendar/gui/dialogs/e-delegate-dialog.c
+++ b/calendar/gui/dialogs/e-delegate-dialog.c
@@ -176,7 +176,7 @@ e_delegate_dialog_construct (EDelegateDialog *edd, const char *name, const char
priv->entry = bonobo_widget_new_control_from_objref (corba_control, CORBA_OBJECT_NIL);
gtk_widget_show (priv->entry);
- gtk_box_pack_start (GTK_BOX (priv->hbox), priv->entry, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (priv->hbox), priv->entry, TRUE, TRUE, 6);
dest = e_destination_new ();
destv[0] = dest;
diff --git a/calendar/gui/dialogs/meeting-page.c b/calendar/gui/dialogs/meeting-page.c
index e07724e34d..d7e6e80d24 100644
--- a/calendar/gui/dialogs/meeting-page.c
+++ b/calendar/gui/dialogs/meeting-page.c
@@ -865,7 +865,7 @@ meeting_page_construct (MeetingPage *mpage, EMeetingModel *emm,
G_CALLBACK (table_canvas_focus_out_cb), mpage);
gtk_widget_show (GTK_WIDGET (priv->etable));
- gtk_box_pack_start (GTK_BOX (priv->main), GTK_WIDGET (priv->etable), TRUE, TRUE, 2);
+ gtk_box_pack_start (GTK_BOX (priv->main), GTK_WIDGET (priv->etable), TRUE, TRUE, 6);
/* Init the widget signals */
init_widgets (mpage);
diff --git a/calendar/gui/dialogs/recurrence-page.c b/calendar/gui/dialogs/recurrence-page.c
index b2041338d7..275ba26c44 100644
--- a/calendar/gui/dialogs/recurrence-page.c
+++ b/calendar/gui/dialogs/recurrence-page.c
@@ -917,12 +917,12 @@ make_weekly_special (RecurrencePage *rpage)
gtk_container_add (GTK_CONTAINER (priv->special), hbox);
label = gtk_label_new (_("on"));
- gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 6);
wp = WEEKDAY_PICKER (weekday_picker_new ());
priv->weekday_picker = GTK_WIDGET (wp);
- gtk_box_pack_start (GTK_BOX (hbox), GTK_WIDGET (wp), FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), GTK_WIDGET (wp), FALSE, FALSE, 6);
gtk_widget_show_all (hbox);
@@ -1170,17 +1170,17 @@ make_monthly_special (RecurrencePage *rpage)
gtk_container_add (GTK_CONTAINER (priv->special), hbox);
label = gtk_label_new (_("on the"));
- gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 6);
adj = GTK_ADJUSTMENT (gtk_adjustment_new (1, 1, 31, 1, 10, 10));
priv->month_num_menu = make_recur_month_num_menu (priv->month_index);
gtk_box_pack_start (GTK_BOX (hbox), priv->month_num_menu,
- FALSE, FALSE, 0);
+ FALSE, FALSE, 6);
priv->month_day_menu = make_recur_month_menu ();
gtk_box_pack_start (GTK_BOX (hbox), priv->month_day_menu,
- FALSE, FALSE, 0);
+ FALSE, FALSE, 6);
gtk_widget_show_all (hbox);
@@ -1352,10 +1352,10 @@ make_ending_count_special (RecurrencePage *rpage)
adj = GTK_ADJUSTMENT (gtk_adjustment_new (1, 1, 10000, 1, 10, 10));
priv->ending_count_spin = gtk_spin_button_new (adj, 1, 0);
gtk_box_pack_start (GTK_BOX (hbox), priv->ending_count_spin,
- FALSE, FALSE, 0);
+ FALSE, FALSE, 6);
label = gtk_label_new (_("occurrences"));
- gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 6);
gtk_widget_show_all (hbox);
diff --git a/calendar/gui/dialogs/schedule-page.c b/calendar/gui/dialogs/schedule-page.c
index d7063e9a4f..2163d51f1e 100644
--- a/calendar/gui/dialogs/schedule-page.c
+++ b/calendar/gui/dialogs/schedule-page.c
@@ -437,7 +437,7 @@ schedule_page_construct (SchedulePage *spage, EMeetingModel *emm)
calendar_config_get_day_end_hour (),
calendar_config_get_day_end_minute ());
gtk_widget_show (GTK_WIDGET (priv->sel));
- gtk_box_pack_start (GTK_BOX (priv->main), GTK_WIDGET (priv->sel), TRUE, TRUE, 2);
+ gtk_box_pack_start (GTK_BOX (priv->main), GTK_WIDGET (priv->sel), TRUE, TRUE, 6);
if (!init_widgets (spage)) {
g_message ("schedule_page_construct(): "
diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c
index 2ca28f056b..b751015d6e 100644
--- a/calendar/gui/e-itip-control.c
+++ b/calendar/gui/e-itip-control.c
@@ -374,7 +374,7 @@ init (EItipControl *itip)
gtk_container_add (GTK_CONTAINER (scrolled_window), priv->html);
gtk_object_weakref (GTK_OBJECT (priv->html), html_destroyed, itip);
gtk_widget_set_usize (scrolled_window, 600, 400);
- gtk_box_pack_start (GTK_BOX (itip), scrolled_window, FALSE, FALSE, 4);
+ gtk_box_pack_start (GTK_BOX (itip), scrolled_window, FALSE, FALSE, 6);
g_signal_connect (priv->html, "url_requested", G_CALLBACK (url_requested_cb), itip);
g_signal_connect (priv->html, "object_requested", G_CALLBACK (object_requested_cb), itip);
diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c
index 0b44e16350..bf113c0b23 100644
--- a/calendar/gui/e-meeting-time-sel.c
+++ b/calendar/gui/e-meeting-time-sel.c
@@ -343,7 +343,7 @@ e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingModel *em
real_table = e_table_scrolled_get_table (E_TABLE_SCROLLED (mts->etable));
g_signal_connect (real_table->sort_info, "sort_info_changed", G_CALLBACK (sort_info_changed_cb), mts);
- gtk_box_pack_start (GTK_BOX (mts->attendees_vbox), mts->etable, TRUE, TRUE, 2);
+ gtk_box_pack_start (GTK_BOX (mts->attendees_vbox), mts->etable, TRUE, TRUE, 6);
gtk_widget_show (mts->etable);
g_free (filename);
@@ -423,7 +423,7 @@ e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingModel *em
button = gtk_button_new_with_label ("");
accel_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (button)->child),
_("_Invite Others..."));
- gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 6);
gtk_widget_show (button);
gtk_widget_add_accelerator (button, "clicked", mts->accel_group,
accel_key, GDK_MOD1_MASK, 0);
@@ -433,7 +433,7 @@ e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingModel *em
G_CALLBACK (e_meeting_time_selector_on_invite_others_button_expose), mts);
mts->options_button = gtk_button_new ();
- gtk_box_pack_start (GTK_BOX (hbox), mts->options_button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), mts->options_button, TRUE, TRUE, 6);
gtk_widget_show (mts->options_button);
g_signal_connect (mts->options_button, "clicked",
@@ -445,13 +445,13 @@ e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingModel *em
label = gtk_label_new ("");
accel_key = gtk_label_parse_uline (GTK_LABEL (label), _("_Options"));
- gtk_box_pack_start (GTK_BOX (child_hbox), label, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (child_hbox), label, TRUE, TRUE, 6);
gtk_widget_show (label);
gtk_widget_add_accelerator (mts->options_button, "clicked", mts->accel_group,
accel_key, GDK_MOD1_MASK, 0);
arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_OUT);
- gtk_box_pack_start (GTK_BOX (child_hbox), arrow, FALSE, FALSE, 2);
+ gtk_box_pack_start (GTK_BOX (child_hbox), arrow, FALSE, FALSE, 6);
gtk_widget_show (arrow);
/* Create the Options menu. */
@@ -517,13 +517,13 @@ e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingModel *em
_("_<<"));
gtk_widget_add_accelerator (button, "clicked", mts->accel_group,
accel_key, GDK_MOD1_MASK | GDK_SHIFT_MASK, 0);
- gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 6);
gtk_widget_show (button);
g_signal_connect (button, "clicked",
G_CALLBACK (e_meeting_time_selector_on_prev_button_clicked), mts);
mts->autopick_button = gtk_button_new ();
- gtk_box_pack_start (GTK_BOX (hbox), mts->autopick_button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), mts->autopick_button, TRUE, TRUE, 6);
gtk_widget_show (mts->autopick_button);
child_hbox = gtk_hbox_new (FALSE, 2);
@@ -532,7 +532,7 @@ e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingModel *em
label = gtk_label_new ("");
accel_key = gtk_label_parse_uline (GTK_LABEL (label), _("_Autopick"));
- gtk_box_pack_start (GTK_BOX (child_hbox), label, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (child_hbox), label, TRUE, TRUE, 6);
gtk_widget_show (label);
gtk_widget_add_accelerator (mts->autopick_button, "clicked", mts->accel_group,
accel_key, GDK_MOD1_MASK, 0);
@@ -540,7 +540,7 @@ e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingModel *em
G_CALLBACK (e_meeting_time_selector_on_autopick_button_clicked), mts);
arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_OUT);
- gtk_box_pack_start (GTK_BOX (child_hbox), arrow, FALSE, FALSE, 2);
+ gtk_box_pack_start (GTK_BOX (child_hbox), arrow, FALSE, FALSE, 6);
gtk_widget_show (arrow);
button = gtk_button_new_with_label ("");
@@ -548,7 +548,7 @@ e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingModel *em
_(">_>"));
gtk_widget_add_accelerator (button, "clicked", mts->accel_group,
accel_key, GDK_MOD1_MASK | GDK_SHIFT_MASK, 0);
- gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 6);
gtk_widget_show (button);
g_signal_connect (button, "clicked",
G_CALLBACK (e_meeting_time_selector_on_next_button_clicked), mts);
@@ -729,7 +729,7 @@ e_meeting_time_selector_add_key_color (EMeetingTimeSelector * mts,
label = gtk_label_new (label_text);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
- gtk_box_pack_start (GTK_BOX (child_hbox), label, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (child_hbox), label, TRUE, TRUE, 6);
gtk_widget_show (label);
g_signal_connect (darea, "expose_event",
diff --git a/calendar/gui/e-timezone-entry.c b/calendar/gui/e-timezone-entry.c
index e439fe2273..6d514ccc93 100644
--- a/calendar/gui/e-timezone-entry.c
+++ b/calendar/gui/e-timezone-entry.c
@@ -125,13 +125,13 @@ e_timezone_entry_init (ETimezoneEntry *tentry)
priv->entry = gtk_entry_new ();
gtk_entry_set_editable (GTK_ENTRY (priv->entry), FALSE);
/*gtk_widget_set_usize (priv->date_entry, 90, 0);*/
- gtk_box_pack_start (GTK_BOX (tentry), priv->entry, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (tentry), priv->entry, TRUE, TRUE, 6);
gtk_widget_show (priv->entry);
g_signal_connect (priv->entry, "changed", G_CALLBACK (on_entry_changed), tentry);
priv->button = gtk_button_new ();
g_signal_connect (priv->button, "clicked", G_CALLBACK (on_button_clicked), tentry);
- gtk_box_pack_start (GTK_BOX (tentry), priv->button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (tentry), priv->button, FALSE, FALSE, 6);
gtk_widget_show (priv->button);
colormap = gtk_widget_get_colormap (priv->button);
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index b56f4a1824..bd480381a8 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -741,7 +741,7 @@ setup_widgets (GnomeCalendar *gcal)
G_CALLBACK (search_bar_category_changed_cb), gcal);
gtk_widget_show (priv->search_bar);
- gtk_box_pack_start (GTK_BOX (gcal), priv->search_bar, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (gcal), priv->search_bar, FALSE, FALSE, 6);
/* The main HPaned, with the notebook of calendar views on the left
and the ECalendar and ToDo list on the right. */
@@ -751,7 +751,7 @@ setup_widgets (GnomeCalendar *gcal)
g_signal_connect (priv->hpane, "button_release_event",
G_CALLBACK (gnome_calendar_hpane_resized), gcal);
gtk_widget_show (priv->hpane);
- gtk_box_pack_start (GTK_BOX (gcal), priv->hpane, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (gcal), priv->hpane, TRUE, TRUE, 6);
/* The Notebook containing the 4 calendar views. */
priv->notebook = gtk_notebook_new ();
diff --git a/calendar/gui/tasks-control.c b/calendar/gui/tasks-control.c
index 1e91b07afd..010fdce485 100644
--- a/calendar/gui/tasks-control.c
+++ b/calendar/gui/tasks-control.c
@@ -474,11 +474,11 @@ confirm_expunge (ETasks *tasks)
gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
gtk_widget_show (label);
- gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)->vbox), label, TRUE, TRUE, 4);
+ gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)->vbox), label, TRUE, TRUE, 6);
checkbox = gtk_check_button_new_with_label (_("Do not ask me again."));
gtk_widget_show (checkbox);
- gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)->vbox), checkbox, TRUE, TRUE, 4);
+ gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)->vbox), checkbox, TRUE, TRUE, 6);
button = gnome_dialog_run (GNOME_DIALOG (dialog));
if (button == 0 && gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (checkbox)))
generated by cgit (git 2.34.1) at 2024-11-14 10:34:14 +0800