diff options
Diffstat (limited to 'calendar/gui/dialogs')
-rw-r--r-- | calendar/gui/dialogs/cal-prefs-dialog.c | 2 | ||||
-rw-r--r-- | calendar/gui/dialogs/comp-editor-util.c | 1 | ||||
-rw-r--r-- | calendar/gui/dialogs/event-editor.h | 1 | ||||
-rw-r--r-- | calendar/gui/dialogs/event-page.c | 6 | ||||
-rw-r--r-- | calendar/gui/dialogs/meeting-page.c | 9 | ||||
-rw-r--r-- | calendar/gui/dialogs/recurrence-page.c | 7 | ||||
-rw-r--r-- | calendar/gui/dialogs/save-comp.c | 3 | ||||
-rw-r--r-- | calendar/gui/dialogs/schedule-page.c | 4 | ||||
-rw-r--r-- | calendar/gui/dialogs/send-comp.c | 1 | ||||
-rw-r--r-- | calendar/gui/dialogs/task-details-page.c | 3 | ||||
-rw-r--r-- | calendar/gui/dialogs/task-editor.h | 1 | ||||
-rw-r--r-- | calendar/gui/dialogs/task-page.c | 5 |
12 files changed, 22 insertions, 21 deletions
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.c b/calendar/gui/dialogs/cal-prefs-dialog.c index bac958f259..03065452c7 100644 --- a/calendar/gui/dialogs/cal-prefs-dialog.c +++ b/calendar/gui/dialogs/cal-prefs-dialog.c @@ -37,7 +37,9 @@ #include "../calendar-commands.h" #include "../e-tasks.h" +#include <gtk/gtksignal.h> #include <gtk/gtkoptionmenu.h> +#include <gtk/gtktogglebutton.h> #include <libgnomeui/gnome-color-picker.h> #include <glade/glade.h> #include <gal/util/e-util.h> diff --git a/calendar/gui/dialogs/comp-editor-util.c b/calendar/gui/dialogs/comp-editor-util.c index c60c416087..8d56097bff 100644 --- a/calendar/gui/dialogs/comp-editor-util.c +++ b/calendar/gui/dialogs/comp-editor-util.c @@ -26,6 +26,7 @@ #include <string.h> #include <ical.h> #include <glib.h> +#include <gtk/gtklabel.h> #include <libgnome/gnome-i18n.h> #include <bonobo-activation/bonobo-activation.h> #include <bonobo/bonobo-control.h> diff --git a/calendar/gui/dialogs/event-editor.h b/calendar/gui/dialogs/event-editor.h index 1b6f72829a..7bb335de96 100644 --- a/calendar/gui/dialogs/event-editor.h +++ b/calendar/gui/dialogs/event-editor.h @@ -24,7 +24,6 @@ #ifndef __EVENT_EDITOR_H__ #define __EVENT_EDITOR_H__ -#include <libgnome/gnome-defs.h> #include <gtk/gtkobject.h> #include "comp-editor.h" diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c index 89fb0b2a89..9ca2d03b2c 100644 --- a/calendar/gui/dialogs/event-page.c +++ b/calendar/gui/dialogs/event-page.c @@ -26,8 +26,8 @@ #endif #include <gtk/gtksignal.h> +#include <gtk/gtktext.h> #include <gtk/gtktogglebutton.h> -#include <libgnome/gnome-defs.h> #include <libgnome/gnome-i18n.h> #include <glade/glade.h> #include <gal/widgets/e-unicode.h> @@ -1294,7 +1294,9 @@ init_widgets (EventPage *epage) GTK_SIGNAL_FUNC (summary_changed_cb), epage); /* Description - turn on word wrap. */ +#if 0 gtk_text_set_word_wrap (GTK_TEXT (priv->description), TRUE); +#endif /* Start and end times */ gtk_signal_connect (GTK_OBJECT (priv->start_time), "changed", @@ -1396,7 +1398,7 @@ event_page_construct (EventPage *epage) priv = epage->priv; priv->xml = glade_xml_new (EVOLUTION_GLADEDIR "/event-page.glade", - NULL); + NULL, NULL); if (!priv->xml) { g_message ("event_page_construct(): " "Could not load the Glade XML file!"); diff --git a/calendar/gui/dialogs/meeting-page.c b/calendar/gui/dialogs/meeting-page.c index 44ff76eb08..ec5823f0e5 100644 --- a/calendar/gui/dialogs/meeting-page.c +++ b/calendar/gui/dialogs/meeting-page.c @@ -31,10 +31,9 @@ #include <gtk/gtktogglebutton.h> #include <gtk/gtkvbox.h> #include <gtk/gtkwindow.h> -#include <libgnome/gnome-defs.h> #include <libgnome/gnome-i18n.h> #include <glade/glade.h> -#include <libgnomeui/gnome-stock.h> +#include <libgnomeui/gnome-stock-icons.h> #include <gal/e-table/e-cell-combo.h> #include <gal/e-table/e-cell-text.h> #include <gal/e-table/e-table-simple.h> @@ -691,8 +690,10 @@ right_click_cb (ETable *etable, gint row, gint col, GdkEvent *event, gpointer da priv->row = e_meeting_model_etable_view_to_model_row (etable, priv->model, view_row); /* FIXME: if you enable Delegate, then change index to '1' */ +#if 0 context_menu[0].pixmap_widget = gnome_stock_new_with_icon (GNOME_STOCK_MENU_TRASH); - +#endif + menu = e_popup_menu_create (context_menu, enable_mask, hide_mask, data); e_auto_kill_popup_menu_on_hide (menu); @@ -745,7 +746,7 @@ meeting_page_construct (MeetingPage *mpage, EMeetingModel *emm, priv = mpage->priv; priv->xml = glade_xml_new (EVOLUTION_GLADEDIR - "/meeting-page.glade", NULL); + "/meeting-page.glade", NULL, NULL); if (!priv->xml) { g_message ("meeting_page_construct(): " "Could not load the Glade XML file!"); diff --git a/calendar/gui/dialogs/recurrence-page.c b/calendar/gui/dialogs/recurrence-page.c index 3fb07a0559..5c5c2fb072 100644 --- a/calendar/gui/dialogs/recurrence-page.c +++ b/calendar/gui/dialogs/recurrence-page.c @@ -25,10 +25,11 @@ #include <config.h> #endif +#include <gtk/gtkmenuitem.h> #include <gtk/gtkoptionmenu.h> +#include <gtk/gtktogglebutton.h> #include <gtk/gtksignal.h> #include <gtk/gtkspinbutton.h> -#include <libgnome/gnome-defs.h> #include <libgnome/gnome-i18n.h> #include <glade/glade.h> #include <gal/widgets/e-unicode.h> @@ -1033,7 +1034,7 @@ month_num_submenu_selection_done_cb (GtkMenuShell *menu_shell, gpointer data) int month_index; item = gtk_menu_get_active (GTK_MENU (menu_shell)); - item = gtk_menu_get_active (GTK_MENU (GTK_MENU_ITEM (item)->submenu)); + item = gtk_menu_get_active (GTK_MENU (gtk_menu_item_get_submenu (GTK_MENU_ITEM (item)))); month_index = GPOINTER_TO_INT (gtk_object_get_user_data (GTK_OBJECT (item))); gtk_object_set_user_data (GTK_OBJECT (data), GINT_TO_POINTER (month_index)); @@ -2427,7 +2428,7 @@ recurrence_page_construct (RecurrencePage *rpage) priv = rpage->priv; priv->xml = glade_xml_new (EVOLUTION_GLADEDIR - "/recurrence-page.glade", NULL); + "/recurrence-page.glade", NULL, NULL); if (!priv->xml) { g_message ("recurrence_page_construct(): " "Could not load the Glade XML file!"); diff --git a/calendar/gui/dialogs/save-comp.c b/calendar/gui/dialogs/save-comp.c index 67a43a7320..29701f92d7 100644 --- a/calendar/gui/dialogs/save-comp.c +++ b/calendar/gui/dialogs/save-comp.c @@ -24,10 +24,9 @@ #endif #include <glib.h> -#include <libgnome/gnome-defs.h> #include <libgnome/gnome-i18n.h> #include <libgnomeui/gnome-messagebox.h> -#include <libgnomeui/gnome-stock.h> +#include <libgnomeui/gnome-stock-icons.h> #include <gal/widgets/e-unicode.h> #include "save-comp.h" diff --git a/calendar/gui/dialogs/schedule-page.c b/calendar/gui/dialogs/schedule-page.c index 6ae7924355..a6d1911018 100644 --- a/calendar/gui/dialogs/schedule-page.c +++ b/calendar/gui/dialogs/schedule-page.c @@ -30,9 +30,7 @@ #include <gtk/gtktogglebutton.h> #include <gtk/gtkvbox.h> #include <gtk/gtkwindow.h> -#include <libgnome/gnome-defs.h> #include <libgnome/gnome-i18n.h> -#include <libgnomeui/gnome-stock.h> #include <libgnomeui/gnome-dialog-util.h> #include <glade/glade.h> #include <gal/e-table/e-cell-combo.h> @@ -427,7 +425,7 @@ schedule_page_construct (SchedulePage *spage, EMeetingModel *emm) priv = spage->priv; priv->xml = glade_xml_new (EVOLUTION_GLADEDIR - "/schedule-page.glade", NULL); + "/schedule-page.glade", NULL, NULL); if (!priv->xml) { g_message ("schedule_page_construct(): " "Could not load the Glade XML file!"); diff --git a/calendar/gui/dialogs/send-comp.c b/calendar/gui/dialogs/send-comp.c index 2afd92320e..01aeef99fd 100644 --- a/calendar/gui/dialogs/send-comp.c +++ b/calendar/gui/dialogs/send-comp.c @@ -23,7 +23,6 @@ #endif #include <glib.h> -#include <libgnome/gnome-defs.h> #include <libgnome/gnome-i18n.h> #include <libgnomeui/gnome-dialog.h> #include <libgnomeui/gnome-dialog-util.h> diff --git a/calendar/gui/dialogs/task-details-page.c b/calendar/gui/dialogs/task-details-page.c index c138ddeda6..3a8149afde 100644 --- a/calendar/gui/dialogs/task-details-page.c +++ b/calendar/gui/dialogs/task-details-page.c @@ -27,7 +27,6 @@ #include <gtk/gtksignal.h> #include <gtk/gtktogglebutton.h> -#include <libgnome/gnome-defs.h> #include <libgnome/gnome-i18n.h> #include <glade/glade.h> #include <gal/widgets/e-unicode.h> @@ -730,7 +729,7 @@ task_details_page_construct (TaskDetailsPage *tdpage) priv = tdpage->priv; priv->xml = glade_xml_new (EVOLUTION_GLADEDIR - "/task-details-page.glade", NULL); + "/task-details-page.glade", NULL, NULL); if (!priv->xml) { g_message ("task_details_page_construct(): " "Could not load the Glade XML file!"); diff --git a/calendar/gui/dialogs/task-editor.h b/calendar/gui/dialogs/task-editor.h index 070546bee0..f1af1f237a 100644 --- a/calendar/gui/dialogs/task-editor.h +++ b/calendar/gui/dialogs/task-editor.h @@ -24,7 +24,6 @@ #ifndef __TASK_EDITOR_H__ #define __TASK_EDITOR_H__ -#include <libgnome/gnome-defs.h> #include <gtk/gtkobject.h> #include "comp-editor.h" diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c index 62732c9eb0..a30a5064c2 100644 --- a/calendar/gui/dialogs/task-page.c +++ b/calendar/gui/dialogs/task-page.c @@ -31,7 +31,6 @@ #include <gtk/gtktogglebutton.h> #include <gtk/gtkspinbutton.h> #include <gtk/gtkoptionmenu.h> -#include <libgnome/gnome-defs.h> #include <libgnome/gnome-i18n.h> #include <glade/glade.h> #include <gal/widgets/e-unicode.h> @@ -868,7 +867,9 @@ init_widgets (TaskPage *tpage) GTK_SIGNAL_FUNC (summary_changed_cb), tpage); /* Description - turn on word wrap. */ +#if 0 gtk_text_set_word_wrap (GTK_TEXT (priv->description), TRUE); +#endif /* Dates */ gtk_signal_connect (GTK_OBJECT (priv->start_date), "changed", @@ -948,7 +949,7 @@ task_page_construct (TaskPage *tpage) priv = tpage->priv; priv->xml = glade_xml_new (EVOLUTION_GLADEDIR "/task-page.glade", - NULL); + NULL, NULL); if (!priv->xml) { g_message ("task_page_construct(): " "Could not load the Glade XML file!"); |