evolution r35606 - in trunk: . a11y/addressbook a11y/calendar a11y/e-table a11y/widgets addressbook/conduit addressbook/gui/component addressbook/gui/contact-editor addressbook/gui/merging addressbook/gui/widgets addressbook/importers addressbook/printing addressbook/tools calendar/conduits/calendar calendar/conduits/common calendar/conduits/memo calendar/conduits/todo calendar/gui calendar/gui/alarm-notify calendar/gui/dialogs calendar/importers e-util filter mail mail/importers plugins/audio-inline plugins/calendar-file plugins/calendar-http plugins/copy-tool plugins/email-custom-header plugins/exchange-operations plugins/external-editor plugins/google-account-setup plugins/groupwise-features plugins/imap-features plugins/ipod-sync plugins/itip-formatter plugins/mailing-list-actions plugins/plugin-manager plugins/prefer-plain plugins/save-attachments plugins/save-calendar shell smime/gui smime/lib widgets/e-timezone-dialog widgets/menus widgets/misc widgets/table w idgets/text
- From: mbarnes svn gnome org
- To: svn-commits-list gnome org
- Subject: evolution r35606 - in trunk: . a11y/addressbook a11y/calendar a11y/e-table a11y/widgets addressbook/conduit addressbook/gui/component addressbook/gui/contact-editor addressbook/gui/merging addressbook/gui/widgets addressbook/importers addressbook/printing addressbook/tools calendar/conduits/calendar calendar/conduits/common calendar/conduits/memo calendar/conduits/todo calendar/gui calendar/gui/alarm-notify calendar/gui/dialogs calendar/importers e-util filter mail mail/importers plugins/audio-inline plugins/calendar-file plugins/calendar-http plugins/copy-tool plugins/email-custom-header plugins/exchange-operations plugins/external-editor plugins/google-account-setup plugins/groupwise-features plugins/imap-features plugins/ipod-sync plugins/itip-formatter plugins/mailing-list-actions plugins/plugin-manager plugins/prefer-plain plugins/save-attachments plugins/save-calendar shell smime/gui smime/lib widgets/e-timezone-dialog widgets/menus widgets/misc widgets/table w idgets/text
- Date: Fri, 6 Jun 2008 15:12:59 +0000 (UTC)
Author: mbarnes
Date: Fri Jun 6 15:12:53 2008
New Revision: 35606
URL: http://svn.gnome.org/viewvc/evolution?rev=35606&view=rev
Log:
2008-06-06 Matthew Barnes <mbarnes redhat com>
** Allow evolution to build with G_DISABLE_SINGLE_INCLUDES and
GTK_DISABLE_SINGLE_INCLUDES defined. (#536637)
Modified:
trunk/ChangeLog
trunk/a11y/addressbook/ea-addressbook-view.h
trunk/a11y/addressbook/ea-minicard-view.c
trunk/a11y/calendar/ea-cal-view.c
trunk/a11y/calendar/ea-cal-view.h
trunk/a11y/calendar/ea-day-view.c
trunk/a11y/calendar/ea-gnome-calendar.c
trunk/a11y/calendar/ea-gnome-calendar.h
trunk/a11y/e-table/gal-a11y-e-table.h
trunk/a11y/e-table/gal-a11y-e-tree.h
trunk/a11y/widgets/ea-calendar-item.c
trunk/a11y/widgets/ea-combo-button.c
trunk/a11y/widgets/ea-combo-button.h
trunk/a11y/widgets/ea-expander.c
trunk/a11y/widgets/ea-expander.h
trunk/addressbook/conduit/address-conduit.c
trunk/addressbook/gui/component/addressbook-component.c
trunk/addressbook/gui/component/addressbook-config.c
trunk/addressbook/gui/component/addressbook-view.c
trunk/addressbook/gui/component/addressbook.c
trunk/addressbook/gui/component/autocompletion-config.c
trunk/addressbook/gui/contact-editor/e-contact-editor-address.c
trunk/addressbook/gui/contact-editor/e-contact-editor-address.h
trunk/addressbook/gui/contact-editor/e-contact-editor-fullname.c
trunk/addressbook/gui/contact-editor/e-contact-editor-fullname.h
trunk/addressbook/gui/contact-editor/e-contact-editor-im.c
trunk/addressbook/gui/contact-editor/e-contact-editor-im.h
trunk/addressbook/gui/contact-editor/e-contact-editor.c
trunk/addressbook/gui/contact-editor/e-contact-editor.h
trunk/addressbook/gui/contact-editor/e-contact-quick-add.c
trunk/addressbook/gui/contact-editor/eab-editor.c
trunk/addressbook/gui/contact-editor/eab-editor.h
trunk/addressbook/gui/merging/eab-contact-merging.c
trunk/addressbook/gui/widgets/e-addressbook-model.c
trunk/addressbook/gui/widgets/e-addressbook-table-adapter.c
trunk/addressbook/gui/widgets/e-addressbook-view.c
trunk/addressbook/gui/widgets/e-addressbook-view.h
trunk/addressbook/gui/widgets/e-minicard-view.c
trunk/addressbook/gui/widgets/e-minicard.c
trunk/addressbook/gui/widgets/e-minicard.h
trunk/addressbook/gui/widgets/eab-gui-util.c
trunk/addressbook/gui/widgets/eab-gui-util.h
trunk/addressbook/gui/widgets/eab-popup-control.c
trunk/addressbook/gui/widgets/eab-popup-control.h
trunk/addressbook/gui/widgets/gal-view-factory-minicard.h
trunk/addressbook/importers/evolution-csv-importer.c
trunk/addressbook/importers/evolution-ldif-importer.c
trunk/addressbook/importers/evolution-vcard-importer.c
trunk/addressbook/printing/e-contact-print-style-editor.h
trunk/addressbook/printing/e-contact-print.c
trunk/addressbook/printing/e-contact-print.h
trunk/addressbook/printing/test-contact-print-style-editor.c
trunk/addressbook/printing/test-print.c
trunk/addressbook/tools/evolution-addressbook-export.c
trunk/calendar/conduits/calendar/calendar-conduit.c
trunk/calendar/conduits/common/libecalendar-common-conduit.c
trunk/calendar/conduits/memo/memo-conduit.c
trunk/calendar/conduits/todo/todo-conduit.c
trunk/calendar/gui/alarm-notify/alarm-notify-dialog.c
trunk/calendar/gui/alarm-notify/alarm-notify-dialog.h
trunk/calendar/gui/alarm-notify/alarm-queue.c
trunk/calendar/gui/alarm-notify/notify-main.c
trunk/calendar/gui/cal-search-bar.c
trunk/calendar/gui/calendar-commands.c
trunk/calendar/gui/comp-editor-factory.c
trunk/calendar/gui/comp-util.h
trunk/calendar/gui/dialogs/alarm-dialog.c
trunk/calendar/gui/dialogs/alarm-list-dialog.c
trunk/calendar/gui/dialogs/cal-attachment-select-file.c
trunk/calendar/gui/dialogs/calendar-setup.c
trunk/calendar/gui/dialogs/cancel-comp.c
trunk/calendar/gui/dialogs/changed-comp.c
trunk/calendar/gui/dialogs/changed-comp.h
trunk/calendar/gui/dialogs/comp-editor-page.c
trunk/calendar/gui/dialogs/comp-editor-page.h
trunk/calendar/gui/dialogs/comp-editor-util.c
trunk/calendar/gui/dialogs/comp-editor-util.h
trunk/calendar/gui/dialogs/comp-editor.c
trunk/calendar/gui/dialogs/copy-source-dialog.c
trunk/calendar/gui/dialogs/copy-source-dialog.h
trunk/calendar/gui/dialogs/delete-comp.c
trunk/calendar/gui/dialogs/delete-comp.h
trunk/calendar/gui/dialogs/delete-error.c
trunk/calendar/gui/dialogs/e-delegate-dialog.c
trunk/calendar/gui/dialogs/e-delegate-dialog.h
trunk/calendar/gui/dialogs/event-editor.h
trunk/calendar/gui/dialogs/event-page.c
trunk/calendar/gui/dialogs/memo-editor.h
trunk/calendar/gui/dialogs/memo-page.c
trunk/calendar/gui/dialogs/recur-comp.c
trunk/calendar/gui/dialogs/recur-comp.h
trunk/calendar/gui/dialogs/recurrence-page.c
trunk/calendar/gui/dialogs/save-comp.h
trunk/calendar/gui/dialogs/schedule-page.c
trunk/calendar/gui/dialogs/select-source-dialog.c
trunk/calendar/gui/dialogs/select-source-dialog.h
trunk/calendar/gui/dialogs/send-comp.c
trunk/calendar/gui/dialogs/send-comp.h
trunk/calendar/gui/dialogs/task-details-page.c
trunk/calendar/gui/dialogs/task-editor.h
trunk/calendar/gui/dialogs/task-page.c
trunk/calendar/gui/e-alarm-list.c
trunk/calendar/gui/e-alarm-list.h
trunk/calendar/gui/e-cal-component-memo-preview.c
trunk/calendar/gui/e-cal-component-memo-preview.h
trunk/calendar/gui/e-cal-component-preview.c
trunk/calendar/gui/e-cal-component-preview.h
trunk/calendar/gui/e-cal-config.c
trunk/calendar/gui/e-cal-list-view.c
trunk/calendar/gui/e-cal-list-view.h
trunk/calendar/gui/e-cal-model-tasks.c
trunk/calendar/gui/e-cal-model.c
trunk/calendar/gui/e-calendar-table.h
trunk/calendar/gui/e-calendar-view.c
trunk/calendar/gui/e-calendar-view.h
trunk/calendar/gui/e-date-time-list.c
trunk/calendar/gui/e-date-time-list.h
trunk/calendar/gui/e-day-view-time-item.c
trunk/calendar/gui/e-day-view.c
trunk/calendar/gui/e-day-view.h
trunk/calendar/gui/e-itip-control.c
trunk/calendar/gui/e-meeting-list-view.c
trunk/calendar/gui/e-meeting-list-view.h
trunk/calendar/gui/e-meeting-store.c
trunk/calendar/gui/e-meeting-store.h
trunk/calendar/gui/e-meeting-time-sel.c
trunk/calendar/gui/e-meeting-time-sel.h
trunk/calendar/gui/e-memo-table.c
trunk/calendar/gui/e-memo-table.h
trunk/calendar/gui/e-memos.c
trunk/calendar/gui/e-memos.h
trunk/calendar/gui/e-select-names-editable.c
trunk/calendar/gui/e-select-names-renderer.c
trunk/calendar/gui/e-select-names-renderer.h
trunk/calendar/gui/e-tasks.c
trunk/calendar/gui/e-tasks.h
trunk/calendar/gui/e-timezone-entry.c
trunk/calendar/gui/e-timezone-entry.h
trunk/calendar/gui/e-week-view.c
trunk/calendar/gui/e-week-view.h
trunk/calendar/gui/gnome-cal.c
trunk/calendar/gui/gnome-cal.h
trunk/calendar/gui/goto.c
trunk/calendar/gui/itip-bonobo-control.c
trunk/calendar/gui/itip-utils.c
trunk/calendar/gui/memos-control.c
trunk/calendar/gui/migration.c
trunk/calendar/gui/tasks-control.c
trunk/calendar/importers/icalendar-importer.c
trunk/e-util/e-categories-config.c
trunk/e-util/e-categories-config.h
trunk/e-util/e-config.c
trunk/e-util/e-dialog-utils.c
trunk/e-util/e-dialog-utils.h
trunk/e-util/e-dialog-widgets.c
trunk/e-util/e-error.c
trunk/e-util/e-event.c
trunk/e-util/e-gui-utils.c
trunk/e-util/e-gui-utils.h
trunk/e-util/e-icon-factory.c
trunk/e-util/e-icon-factory.h
trunk/e-util/e-import.c
trunk/e-util/e-plugin.h
trunk/e-util/e-popup.c
trunk/e-util/e-request.c
trunk/e-util/e-request.h
trunk/e-util/e-text-event-processor-types.h
trunk/e-util/e-text-event-processor.h
trunk/e-util/e-util-labels.c
trunk/e-util/e-util-labels.h
trunk/e-util/gconf-bridge.c
trunk/e-util/gconf-bridge.h
trunk/filter/filter-colour.c
trunk/filter/filter-element.h
trunk/filter/filter-file.c
trunk/filter/filter-int.c
trunk/filter/filter-part.c
trunk/mail/em-account-editor.c
trunk/mail/em-account-editor.h
trunk/mail/em-account-prefs.c
trunk/mail/em-account-prefs.h
trunk/mail/em-composer-utils.c
trunk/mail/em-config.c
trunk/mail/em-folder-browser.c
trunk/mail/em-folder-properties.c
trunk/mail/em-folder-selection-button.c
trunk/mail/em-folder-selection-button.h
trunk/mail/em-folder-selection.c
trunk/mail/em-folder-selector.c
trunk/mail/em-folder-selector.h
trunk/mail/em-folder-tree-model.h
trunk/mail/em-folder-tree.c
trunk/mail/em-folder-tree.h
trunk/mail/em-folder-view.c
trunk/mail/em-folder-view.h
trunk/mail/em-format-html-display.c
trunk/mail/em-format-html.c
trunk/mail/em-html-stream.c
trunk/mail/em-icon-stream.c
trunk/mail/em-mailer-prefs.c
trunk/mail/em-mailer-prefs.h
trunk/mail/em-menu.c
trunk/mail/em-message-browser.c
trunk/mail/em-message-browser.h
trunk/mail/em-network-prefs.c
trunk/mail/em-network-prefs.h
trunk/mail/em-popup.c
trunk/mail/em-subscribe-editor.c
trunk/mail/em-subscribe-editor.h
trunk/mail/importers/elm-importer.c
trunk/mail/importers/evolution-mbox-importer.c
trunk/mail/importers/pine-importer.c
trunk/mail/mail-component.c
trunk/mail/mail-config.c
trunk/mail/mail-send-recv.c
trunk/mail/mail-send-recv.h
trunk/mail/message-list.c
trunk/mail/message-list.h
trunk/mail/message-tag-editor.c
trunk/mail/message-tag-editor.h
trunk/mail/message-tag-followup.c
trunk/plugins/audio-inline/audio-inline.c
trunk/plugins/calendar-file/calendar-file.c
trunk/plugins/calendar-http/calendar-http.c
trunk/plugins/copy-tool/copy-tool.c
trunk/plugins/email-custom-header/email-custom-header.c
trunk/plugins/email-custom-header/email-custom-header.h
trunk/plugins/exchange-operations/exchange-account-setup.c
trunk/plugins/exchange-operations/exchange-change-password.c
trunk/plugins/exchange-operations/exchange-delegates-user.c
trunk/plugins/exchange-operations/exchange-delegates-user.h
trunk/plugins/exchange-operations/exchange-delegates.c
trunk/plugins/exchange-operations/exchange-delegates.h
trunk/plugins/exchange-operations/exchange-folder-permission.c
trunk/plugins/exchange-operations/exchange-folder-size-display.c
trunk/plugins/exchange-operations/exchange-folder-size-display.h
trunk/plugins/exchange-operations/exchange-folder.c
trunk/plugins/exchange-operations/exchange-permissions-dialog.c
trunk/plugins/exchange-operations/exchange-permissions-dialog.h
trunk/plugins/exchange-operations/exchange-send-options.c
trunk/plugins/exchange-operations/exchange-send-options.h
trunk/plugins/exchange-operations/exchange-user-dialog.c
trunk/plugins/exchange-operations/exchange-user-dialog.h
trunk/plugins/external-editor/external-editor.c
trunk/plugins/google-account-setup/google-source.c
trunk/plugins/groupwise-features/addressbook-groupwise.c
trunk/plugins/groupwise-features/junk-settings.c
trunk/plugins/groupwise-features/junk-settings.h
trunk/plugins/groupwise-features/proxy-login.c
trunk/plugins/groupwise-features/proxy-login.h
trunk/plugins/groupwise-features/proxy.c
trunk/plugins/groupwise-features/proxy.h
trunk/plugins/groupwise-features/share-folder.c
trunk/plugins/groupwise-features/share-folder.h
trunk/plugins/imap-features/imap-headers.c
trunk/plugins/ipod-sync/ical-format.c
trunk/plugins/itip-formatter/itip-view.c
trunk/plugins/itip-formatter/itip-view.h
trunk/plugins/mailing-list-actions/mailing-list-actions.c
trunk/plugins/plugin-manager/plugin-manager.c
trunk/plugins/prefer-plain/prefer-plain.c
trunk/plugins/save-attachments/save-attachments.c
trunk/plugins/save-calendar/csv-format.c
trunk/plugins/save-calendar/ical-format.c
trunk/plugins/save-calendar/rdf-format.c
trunk/plugins/save-calendar/save-calendar.c
trunk/shell/e-history.h
trunk/shell/e-shell-folder-title-bar.c
trunk/shell/e-shell-folder-title-bar.h
trunk/shell/e-shell-importer.c
trunk/shell/e-shell-settings-dialog.c
trunk/shell/e-shell-view.c
trunk/shell/e-shell-window.c
trunk/shell/e-shell.c
trunk/shell/e-sidebar.c
trunk/shell/e-sidebar.h
trunk/shell/e-user-creatable-items-handler.c
trunk/shell/evolution-config-control.c
trunk/shell/evolution-config-control.h
trunk/shell/evolution-shell-component-utils.h
trunk/shell/main.c
trunk/smime/gui/ca-trust-dialog.c
trunk/smime/gui/ca-trust-dialog.h
trunk/smime/gui/cert-trust-dialog.c
trunk/smime/gui/certificate-viewer.c
trunk/smime/gui/certificate-viewer.h
trunk/smime/gui/e-cert-selector.c
trunk/smime/gui/e-cert-selector.h
trunk/smime/lib/e-cert-db.c
trunk/widgets/e-timezone-dialog/e-timezone-dialog.c
trunk/widgets/e-timezone-dialog/e-timezone-dialog.h
trunk/widgets/menus/gal-define-views-dialog.c
trunk/widgets/menus/gal-define-views-dialog.h
trunk/widgets/menus/gal-view-collection.h
trunk/widgets/menus/gal-view-etable.h
trunk/widgets/menus/gal-view-factory-etable.h
trunk/widgets/menus/gal-view-factory.h
trunk/widgets/menus/gal-view-instance-save-as-dialog.c
trunk/widgets/menus/gal-view-instance-save-as-dialog.h
trunk/widgets/menus/gal-view-instance.h
trunk/widgets/menus/gal-view-new-dialog.c
trunk/widgets/menus/gal-view-new-dialog.h
trunk/widgets/menus/gal-view.h
trunk/widgets/misc/e-activity-handler.c
trunk/widgets/misc/e-attachment.c
trunk/widgets/misc/e-attachment.h
trunk/widgets/misc/e-calendar-item.c
trunk/widgets/misc/e-calendar.c
trunk/widgets/misc/e-calendar.h
trunk/widgets/misc/e-canvas-vbox.h
trunk/widgets/misc/e-canvas.h
trunk/widgets/misc/e-cell-renderer-combo.c
trunk/widgets/misc/e-cell-renderer-combo.h
trunk/widgets/misc/e-colors.c
trunk/widgets/misc/e-colors.h
trunk/widgets/misc/e-combo-button.c
trunk/widgets/misc/e-combo-button.h
trunk/widgets/misc/e-combo-cell-editable.c
trunk/widgets/misc/e-combo-cell-editable.h
trunk/widgets/misc/e-config-page.h
trunk/widgets/misc/e-dateedit.c
trunk/widgets/misc/e-dateedit.h
trunk/widgets/misc/e-dropdown-button.c
trunk/widgets/misc/e-dropdown-button.h
trunk/widgets/misc/e-expander.c
trunk/widgets/misc/e-expander.h
trunk/widgets/misc/e-gui-utils.h
trunk/widgets/misc/e-icon-entry.c
trunk/widgets/misc/e-icon-entry.h
trunk/widgets/misc/e-image-chooser.c
trunk/widgets/misc/e-image-chooser.h
trunk/widgets/misc/e-info-label.c
trunk/widgets/misc/e-info-label.h
trunk/widgets/misc/e-map.c
trunk/widgets/misc/e-map.h
trunk/widgets/misc/e-multi-config-dialog.c
trunk/widgets/misc/e-multi-config-dialog.h
trunk/widgets/misc/e-popup-menu.h
trunk/widgets/misc/e-printable.h
trunk/widgets/misc/e-search-bar.c
trunk/widgets/misc/e-search-bar.h
trunk/widgets/misc/e-selection-model-array.h
trunk/widgets/misc/e-selection-model.h
trunk/widgets/misc/e-send-options.c
trunk/widgets/misc/e-send-options.h
trunk/widgets/misc/e-spinner.c
trunk/widgets/misc/e-spinner.h
trunk/widgets/misc/e-task-bar.c
trunk/widgets/misc/e-task-bar.h
trunk/widgets/misc/e-task-widget.c
trunk/widgets/misc/e-task-widget.h
trunk/widgets/misc/test-calendar.c
trunk/widgets/misc/test-dateedit.c
trunk/widgets/misc/test-dropdown-button.c
trunk/widgets/misc/test-info-label.c
trunk/widgets/misc/test-multi-config-dialog.c
trunk/widgets/table/e-cell-spin-button.h
trunk/widgets/table/e-cell-text.h
trunk/widgets/table/e-cell.h
trunk/widgets/table/e-table-config.h
trunk/widgets/table/e-table-field-chooser-dialog.h
trunk/widgets/table/e-table-field-chooser.h
trunk/widgets/table/e-table-scrolled.h
trunk/widgets/table/e-table-search.h
trunk/widgets/table/e-table-selection-model.h
trunk/widgets/table/e-table-without.h
trunk/widgets/table/e-table.h
trunk/widgets/table/e-tree-scrolled.h
trunk/widgets/table/e-tree-selection-model.h
trunk/widgets/table/e-tree.h
trunk/widgets/text/e-text-model.h
trunk/widgets/text/e-text.h
Modified: trunk/a11y/addressbook/ea-addressbook-view.h
==============================================================================
--- trunk/a11y/addressbook/ea-addressbook-view.h (original)
+++ trunk/a11y/addressbook/ea-addressbook-view.h Fri Jun 6 15:12:53 2008
@@ -22,7 +22,7 @@
#ifndef __EA_ADDRESSBOOK_VIEW_H__
#define __EA_ADDRESSBOOK_VIEW_H__
-#include <gtk/gtkaccessible.h>
+#include <gtk/gtk.h>
#include "e-addressbook-view.h"
#ifdef __cplusplus
Modified: trunk/a11y/addressbook/ea-minicard-view.c
==============================================================================
--- trunk/a11y/addressbook/ea-minicard-view.c (original)
+++ trunk/a11y/addressbook/ea-minicard-view.c Fri Jun 6 15:12:53 2008
@@ -21,8 +21,7 @@
#include <config.h>
#include <string.h>
-#include <gtk/gtkaccessible.h>
-#include <glib/gstrfuncs.h>
+#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include "ea-minicard.h"
#include "ea-minicard-view.h"
Modified: trunk/a11y/calendar/ea-cal-view.c
==============================================================================
--- trunk/a11y/calendar/ea-cal-view.c (original)
+++ trunk/a11y/calendar/ea-cal-view.c Fri Jun 6 15:12:53 2008
@@ -29,7 +29,7 @@
#include "e-week-view.h"
#include "calendar-commands.h"
#include "goto.h"
-#include <glib/gstrfuncs.h>
+#include <glib.h>
#include <glib/gi18n.h>
static void ea_cal_view_class_init (EaCalViewClass *klass);
Modified: trunk/a11y/calendar/ea-cal-view.h
==============================================================================
--- trunk/a11y/calendar/ea-cal-view.h (original)
+++ trunk/a11y/calendar/ea-cal-view.h Fri Jun 6 15:12:53 2008
@@ -26,7 +26,7 @@
#ifndef __EA_CAL_VIEW_H__
#define __EA_CAL_VIEW_H__
-#include <gtk/gtkaccessible.h>
+#include <gtk/gtk.h>
#include "e-calendar-view.h"
#ifdef __cplusplus
Modified: trunk/a11y/calendar/ea-day-view.c
==============================================================================
--- trunk/a11y/calendar/ea-day-view.c (original)
+++ trunk/a11y/calendar/ea-day-view.c Fri Jun 6 15:12:53 2008
@@ -29,7 +29,7 @@
#include "ea-calendar-helpers.h"
#include "ea-gnome-calendar.h"
#include "calendar-commands.h"
-#include <glib/gstrfuncs.h>
+#include <glib.h>
#include <glib/gi18n.h>
static void ea_day_view_class_init (EaDayViewClass *klass);
Modified: trunk/a11y/calendar/ea-gnome-calendar.c
==============================================================================
--- trunk/a11y/calendar/ea-gnome-calendar.c (original)
+++ trunk/a11y/calendar/ea-gnome-calendar.c Fri Jun 6 15:12:53 2008
@@ -26,7 +26,7 @@
#include "ea-gnome-calendar.h"
#include "calendar-commands.h"
#include <string.h>
-#include <gtk/gtknotebook.h>
+#include <gtk/gtk.h>
#include <libecal/e-cal-time-util.h>
#include <libedataserver/e-data-server-util.h>
#include <glib/gi18n.h>
Modified: trunk/a11y/calendar/ea-gnome-calendar.h
==============================================================================
--- trunk/a11y/calendar/ea-gnome-calendar.h (original)
+++ trunk/a11y/calendar/ea-gnome-calendar.h Fri Jun 6 15:12:53 2008
@@ -26,7 +26,7 @@
#ifndef __EA_GNOME_CALENDAR_H__
#define __EA_GNOME_CALENDAR_H__
-#include <gtk/gtkaccessible.h>
+#include <gtk/gtk.h>
#include "gnome-cal.h"
#ifdef __cplusplus
Modified: trunk/a11y/e-table/gal-a11y-e-table.h
==============================================================================
--- trunk/a11y/e-table/gal-a11y-e-table.h (original)
+++ trunk/a11y/e-table/gal-a11y-e-table.h Fri Jun 6 15:12:53 2008
@@ -9,10 +9,9 @@
#ifndef __GAL_A11Y_E_TABLE_H__
#define __GAL_A11Y_E_TABLE_H__
-#include <glib-object.h>
+#include <gtk/gtk.h>
#include <atk/atkobject.h>
#include <atk/atkcomponent.h>
-#include <gtk/gtkaccessible.h>
#define GAL_A11Y_TYPE_E_TABLE (gal_a11y_e_table_get_type ())
#define GAL_A11Y_E_TABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAL_A11Y_TYPE_E_TABLE, GalA11yETable))
Modified: trunk/a11y/e-table/gal-a11y-e-tree.h
==============================================================================
--- trunk/a11y/e-table/gal-a11y-e-tree.h (original)
+++ trunk/a11y/e-table/gal-a11y-e-tree.h Fri Jun 6 15:12:53 2008
@@ -7,10 +7,9 @@
#ifndef __GAL_A11Y_E_TREE_H__
#define __GAL_A11Y_E_TREE_H__
-#include <glib-object.h>
+#include <gtk/gtk.h>
#include <atk/atkobject.h>
#include <atk/atkcomponent.h>
-#include <gtk/gtkaccessible.h>
#define GAL_A11Y_TYPE_E_TREE (gal_a11y_e_tree_get_type ())
#define GAL_A11Y_E_TREE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAL_A11Y_TYPE_E_TREE, GalA11yETree))
Modified: trunk/a11y/widgets/ea-calendar-item.c
==============================================================================
--- trunk/a11y/widgets/ea-calendar-item.c (original)
+++ trunk/a11y/widgets/ea-calendar-item.c Fri Jun 6 15:12:53 2008
@@ -27,7 +27,7 @@
#include <time.h>
#include <string.h>
#include <libgnomecanvas/gnome-canvas.h>
-#include <glib/gdate.h>
+#include <glib.h>
#include <e-util/e-util.h>
#include <glib/gi18n.h>
#include <libedataserver/e-data-server-util.h>
Modified: trunk/a11y/widgets/ea-combo-button.c
==============================================================================
--- trunk/a11y/widgets/ea-combo-button.c (original)
+++ trunk/a11y/widgets/ea-combo-button.c Fri Jun 6 15:12:53 2008
@@ -6,8 +6,7 @@
#include <config.h>
#include "ea-combo-button.h"
-#include <gtk/gtkbutton.h>
-#include <gtk/gtklabel.h>
+#include <gtk/gtk.h>
#include <glib/gi18n.h>
static AtkObjectClass *parent_class;
Modified: trunk/a11y/widgets/ea-combo-button.h
==============================================================================
--- trunk/a11y/widgets/ea-combo-button.h (original)
+++ trunk/a11y/widgets/ea-combo-button.h Fri Jun 6 15:12:53 2008
@@ -7,7 +7,7 @@
#ifndef __EA_COMBO_BUTTON_H_
#define __EA_COMBO_BUTTON_H_
-#include <gtk/gtkaccessible.h>
+#include <gtk/gtk.h>
#include <misc/e-combo-button.h>
#define EA_TYPE_COMBO_BUTTON (ea_combo_button_get_type ())
Modified: trunk/a11y/widgets/ea-expander.c
==============================================================================
--- trunk/a11y/widgets/ea-expander.c (original)
+++ trunk/a11y/widgets/ea-expander.c Fri Jun 6 15:12:53 2008
@@ -22,7 +22,6 @@
#include <config.h>
#include "ea-expander.h"
-#include <gtk/gtkbutton.h>
#include <glib/gi18n.h>
static AtkObjectClass *parent_class;
Modified: trunk/a11y/widgets/ea-expander.h
==============================================================================
--- trunk/a11y/widgets/ea-expander.h (original)
+++ trunk/a11y/widgets/ea-expander.h Fri Jun 6 15:12:53 2008
@@ -23,7 +23,7 @@
#ifndef _EA_EXPANDER_H_
#define _EA_EXPANDER_H_
-#include <gtk/gtkaccessible.h>
+#include <gtk/gtk.h>
#include <misc/e-expander.h>
#define EA_TYPE_EXPANDER (ea_expander_get_type ())
Modified: trunk/addressbook/conduit/address-conduit.c
==============================================================================
--- trunk/addressbook/conduit/address-conduit.c (original)
+++ trunk/addressbook/conduit/address-conduit.c Fri Jun 6 15:12:53 2008
@@ -41,6 +41,7 @@
#include <gpilotd/gnome-pilot-conduit-sync-abs.h>
#include <libgpilotdCM/gnome-pilot-conduit-management.h>
#include <libgpilotdCM/gnome-pilot-conduit-config.h>
+#include <libgnome/gnome-config.h>
#include <e-dialog-widgets.h>
#include <e-pilot-map.h>
#include <e-pilot-settings.h>
Modified: trunk/addressbook/gui/component/addressbook-component.c
==============================================================================
--- trunk/addressbook/gui/component/addressbook-component.c (original)
+++ trunk/addressbook/gui/component/addressbook-component.c Fri Jun 6 15:12:53 2008
@@ -44,8 +44,8 @@
#include "shell/e-component-view.h"
#include <string.h>
+#include <gtk/gtk.h>
#include <bonobo/bonobo-i18n.h>
-#include <gtk/gtkimage.h>
#include <gconf/gconf-client.h>
#include <e-util/e-util.h>
#include <libedataserver/e-url.h>
Modified: trunk/addressbook/gui/component/addressbook-config.c
==============================================================================
--- trunk/addressbook/gui/component/addressbook-config.c (original)
+++ trunk/addressbook/gui/component/addressbook-config.c Fri Jun 6 15:12:53 2008
@@ -15,20 +15,6 @@
#include <stdlib.h>
#include <sys/time.h>
-#include <gtk/gtkcombo.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkrange.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkcombobox.h>
-#include <gtk/gtkoptionmenu.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtkcelllayout.h>
-#include <gtk/gtklabel.h>
#include <gtk/gtk.h>
#include <glib/gi18n.h>
Modified: trunk/addressbook/gui/component/addressbook-view.c
==============================================================================
--- trunk/addressbook/gui/component/addressbook-view.c (original)
+++ trunk/addressbook/gui/component/addressbook-view.c Fri Jun 6 15:12:53 2008
@@ -26,11 +26,7 @@
#endif
#include <string.h>
-#include <glib.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtknotebook.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkmessagedialog.h>
+#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <libgnomeui/gnome-app.h>
#include <libgnomeui/gnome-href.h>
Modified: trunk/addressbook/gui/component/addressbook.c
==============================================================================
--- trunk/addressbook/gui/component/addressbook.c (original)
+++ trunk/addressbook/gui/component/addressbook.c Fri Jun 6 15:12:53 2008
@@ -24,7 +24,7 @@
#include <string.h>
-#include <gtk/gtkmessagedialog.h>
+#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <libebook/e-book.h>
#include <libedataserver/e-url.h>
Modified: trunk/addressbook/gui/component/autocompletion-config.c
==============================================================================
--- trunk/addressbook/gui/component/autocompletion-config.c (original)
+++ trunk/addressbook/gui/component/autocompletion-config.c Fri Jun 6 15:12:53 2008
@@ -33,11 +33,8 @@
#include <libedataserver/e-source-list.h>
#include <libedataserverui/e-source-selector.h>
+#include <gtk/gtk.h>
#include <glib/gi18n.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtksignal.h>
typedef struct {
Modified: trunk/addressbook/gui/contact-editor/e-contact-editor-address.c
==============================================================================
--- trunk/addressbook/gui/contact-editor/e-contact-editor-address.c (original)
+++ trunk/addressbook/gui/contact-editor/e-contact-editor-address.c Fri Jun 6 15:12:53 2008
@@ -25,14 +25,9 @@
#include <e-util/e-icon-factory.h>
#include <e-util/e-util-private.h>
-#include <glib.h>
#include <glib/gi18n.h>
#include <libgnome/gnome-util.h>
#include <misc/e-gui-utils.h>
-#include <gtk/gtkcombo.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtklabel.h>
#include <string.h>
#include <stdlib.h>
#include <locale.h>
Modified: trunk/addressbook/gui/contact-editor/e-contact-editor-address.h
==============================================================================
--- trunk/addressbook/gui/contact-editor/e-contact-editor-address.h (original)
+++ trunk/addressbook/gui/contact-editor/e-contact-editor-address.h Fri Jun 6 15:12:53 2008
@@ -20,7 +20,7 @@
#ifndef __E_CONTACT_EDITOR_ADDRESS_H__
#define __E_CONTACT_EDITOR_ADDRESS_H__
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
#include <glade/glade.h>
#include <libebook/e-contact.h>
Modified: trunk/addressbook/gui/contact-editor/e-contact-editor-fullname.c
==============================================================================
--- trunk/addressbook/gui/contact-editor/e-contact-editor-fullname.c (original)
+++ trunk/addressbook/gui/contact-editor/e-contact-editor-fullname.c Fri Jun 6 15:12:53 2008
@@ -25,10 +25,6 @@
#include <e-util/e-util-private.h>
#include <libgnome/gnome-util.h>
#include <glib/gi18n.h>
-#include <gtk/gtkcombo.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtklabel.h>
static void e_contact_editor_fullname_init (EContactEditorFullname *card);
static void e_contact_editor_fullname_class_init (EContactEditorFullnameClass *klass);
Modified: trunk/addressbook/gui/contact-editor/e-contact-editor-fullname.h
==============================================================================
--- trunk/addressbook/gui/contact-editor/e-contact-editor-fullname.h (original)
+++ trunk/addressbook/gui/contact-editor/e-contact-editor-fullname.h Fri Jun 6 15:12:53 2008
@@ -20,7 +20,7 @@
#ifndef __E_CONTACT_EDITOR_FULLNAME_H__
#define __E_CONTACT_EDITOR_FULLNAME_H__
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
#include <glade/glade.h>
#include <libebook/e-contact.h>
Modified: trunk/addressbook/gui/contact-editor/e-contact-editor-im.c
==============================================================================
--- trunk/addressbook/gui/contact-editor/e-contact-editor-im.c (original)
+++ trunk/addressbook/gui/contact-editor/e-contact-editor-im.c Fri Jun 6 15:12:53 2008
@@ -23,15 +23,6 @@
#include "e-contact-editor-im.h"
#include <libgnome/gnome-util.h>
#include <glib/gi18n.h>
-#include <gtk/gtkbox.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkoptionmenu.h>
-#include <gtk/gtksizegroup.h>
-#include <gtk/gtkstock.h>
#include <string.h>
#include <e-util/e-icon-factory.h>
#include <e-util/e-util-private.h>
Modified: trunk/addressbook/gui/contact-editor/e-contact-editor-im.h
==============================================================================
--- trunk/addressbook/gui/contact-editor/e-contact-editor-im.h (original)
+++ trunk/addressbook/gui/contact-editor/e-contact-editor-im.h Fri Jun 6 15:12:53 2008
@@ -20,7 +20,7 @@
#ifndef __E_CONTACT_EDITOR_IM_H__
#define __E_CONTACT_EDITOR_IM_H__
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
#include <glade/glade.h>
#include <libebook/e-contact.h>
Modified: trunk/addressbook/gui/contact-editor/e-contact-editor.c
==============================================================================
--- trunk/addressbook/gui/contact-editor/e-contact-editor.c (original)
+++ trunk/addressbook/gui/contact-editor/e-contact-editor.c Fri Jun 6 15:12:53 2008
@@ -26,15 +26,8 @@
#include <string.h>
#include <time.h>
+#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtkcheckmenuitem.h>
-#include <gtk/gtkcombo.h>
-#include <gtk/gtktextview.h>
-#include <gtk/gtkmessagedialog.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtklabel.h>
#include <libgnomeui/gnome-window-icon.h>
#include <libgnome/gnome-util.h>
#include <glib/gi18n.h>
Modified: trunk/addressbook/gui/contact-editor/e-contact-editor.h
==============================================================================
--- trunk/addressbook/gui/contact-editor/e-contact-editor.h (original)
+++ trunk/addressbook/gui/contact-editor/e-contact-editor.h Fri Jun 6 15:12:53 2008
@@ -30,8 +30,7 @@
#include <libebook/e-book.h>
#include <libebook/e-contact.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtkliststore.h>
+#include <gtk/gtk.h>
G_BEGIN_DECLS
Modified: trunk/addressbook/gui/contact-editor/e-contact-quick-add.c
==============================================================================
--- trunk/addressbook/gui/contact-editor/e-contact-quick-add.c (original)
+++ trunk/addressbook/gui/contact-editor/e-contact-quick-add.c Fri Jun 6 15:12:53 2008
@@ -27,12 +27,7 @@
#include <config.h>
#include <ctype.h>
#include <string.h>
-#include <glib.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkstock.h>
+#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <libgnomeui/gnome-app.h>
#include <libebook/e-book.h>
Modified: trunk/addressbook/gui/contact-editor/eab-editor.c
==============================================================================
--- trunk/addressbook/gui/contact-editor/eab-editor.c (original)
+++ trunk/addressbook/gui/contact-editor/eab-editor.c Fri Jun 6 15:12:53 2008
@@ -22,8 +22,7 @@
#include <config.h>
#endif
-#include <gtk/gtkstock.h>
-#include <gtk/gtkmessagedialog.h>
+#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include "eab-editor.h"
Modified: trunk/addressbook/gui/contact-editor/eab-editor.h
==============================================================================
--- trunk/addressbook/gui/contact-editor/eab-editor.h (original)
+++ trunk/addressbook/gui/contact-editor/eab-editor.h Fri Jun 6 15:12:53 2008
@@ -28,8 +28,7 @@
#include <libebook/e-book.h>
#include <libebook/e-contact.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtkliststore.h>
+#include <gtk/gtk.h>
G_BEGIN_DECLS
Modified: trunk/addressbook/gui/merging/eab-contact-merging.c
==============================================================================
--- trunk/addressbook/gui/merging/eab-contact-merging.c (original)
+++ trunk/addressbook/gui/merging/eab-contact-merging.c Fri Jun 6 15:12:53 2008
@@ -14,12 +14,7 @@
#include "eab-contact-merging.h"
#include "eab-contact-compare.h"
#include <glade/glade.h>
-#include <gtk/gtktable.h>
#include <gtk/gtk.h>
-#include <gtk/gtkcombo.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkcontainer.h>
#include <string.h>
#include "addressbook/gui/widgets/eab-contact-display.h"
#include "e-util/e-util-private.h"
Modified: trunk/addressbook/gui/widgets/e-addressbook-model.c
==============================================================================
--- trunk/addressbook/gui/widgets/e-addressbook-model.c (original)
+++ trunk/addressbook/gui/widgets/e-addressbook-model.c Fri Jun 6 15:12:53 2008
@@ -9,13 +9,13 @@
#include <config.h>
#include <string.h>
+#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include "eab-marshal.h"
#include "e-addressbook-model.h"
#include <libxml/tree.h>
#include <libxml/parser.h>
#include <libxml/xmlmemory.h>
-#include <gnome.h>
#include <misc/e-gui-utils.h>
#include "eab-gui-util.h"
Modified: trunk/addressbook/gui/widgets/e-addressbook-table-adapter.c
==============================================================================
--- trunk/addressbook/gui/widgets/e-addressbook-table-adapter.c (original)
+++ trunk/addressbook/gui/widgets/e-addressbook-table-adapter.c Fri Jun 6 15:12:53 2008
@@ -1,6 +1,7 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
#include <config.h>
+#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include "e-addressbook-model.h"
#include "e-addressbook-table-adapter.h"
@@ -9,7 +10,6 @@
#include <libxml/tree.h>
#include <libxml/parser.h>
#include <libxml/xmlmemory.h>
-#include <gnome.h>
struct _EAddressbookTableAdapterPrivate {
EABModel *model;
Modified: trunk/addressbook/gui/widgets/e-addressbook-view.c
==============================================================================
--- trunk/addressbook/gui/widgets/e-addressbook-view.c (original)
+++ trunk/addressbook/gui/widgets/e-addressbook-view.c Fri Jun 6 15:12:53 2008
@@ -22,11 +22,8 @@
#include <config.h>
-#include <gtk/gtk.h>
-
#include <glib/gi18n.h>
#include <libgnome/gnome-util.h>
-#include <gtk/gtkscrolledwindow.h>
#include <table/e-table-scrolled.h>
#include <table/e-table-model.h>
#include <misc/e-gui-utils.h>
Modified: trunk/addressbook/gui/widgets/e-addressbook-view.h
==============================================================================
--- trunk/addressbook/gui/widgets/e-addressbook-view.h (original)
+++ trunk/addressbook/gui/widgets/e-addressbook-view.h Fri Jun 6 15:12:53 2008
@@ -20,7 +20,7 @@
#ifndef __EAB_VIEW_H__
#define __EAB_VIEW_H__
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
#include <bonobo/bonobo-ui-component.h>
#include <widgets/menus/gal-view-instance.h>
#include <libebook/e-book.h>
Modified: trunk/addressbook/gui/widgets/e-minicard-view.c
==============================================================================
--- trunk/addressbook/gui/widgets/e-minicard-view.c (original)
+++ trunk/addressbook/gui/widgets/e-minicard-view.c Fri Jun 6 15:12:53 2008
@@ -27,8 +27,7 @@
#include "eab-marshal.h"
#include "util/eab-book-util.h"
-#include <gtk/gtkselection.h>
-#include <gtk/gtkdnd.h>
+#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
#include <misc/e-canvas.h>
#include <glib/gi18n.h>
Modified: trunk/addressbook/gui/widgets/e-minicard.c
==============================================================================
--- trunk/addressbook/gui/widgets/e-minicard.c (original)
+++ trunk/addressbook/gui/widgets/e-minicard.c Fri Jun 6 15:12:53 2008
@@ -21,9 +21,6 @@
#include <config.h>
#include <string.h>
-#include <glib.h>
-#include <gtk/gtkdnd.h>
-#include <gtk/gtkmain.h>
#include <gdk/gdkkeysyms.h>
#include <glib/gi18n.h>
#include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
Modified: trunk/addressbook/gui/widgets/e-minicard.h
==============================================================================
--- trunk/addressbook/gui/widgets/e-minicard.h (original)
+++ trunk/addressbook/gui/widgets/e-minicard.h Fri Jun 6 15:12:53 2008
@@ -20,7 +20,7 @@
#ifndef __E_MINICARD_H__
#define __E_MINICARD_H__
-#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gtk/gtk.h>
#include "addressbook/gui/contact-editor/eab-editor.h"
#include <libgnomecanvas/gnome-canvas.h>
#include <libebook/e-contact.h>
Modified: trunk/addressbook/gui/widgets/eab-gui-util.c
==============================================================================
--- trunk/addressbook/gui/widgets/eab-gui-util.c (original)
+++ trunk/addressbook/gui/widgets/eab-gui-util.c Fri Jun 6 15:12:53 2008
@@ -26,6 +26,7 @@
#include <errno.h>
#include <string.h>
+#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <libedataserver/e-data-server-util.h>
#include <libedataserverui/e-source-selector.h>
@@ -38,7 +39,6 @@
#include "misc/e-image-chooser.h"
#include <e-util/e-icon-factory.h>
#include "eab-contact-merging.h"
-#include <gnome.h>
#include <composer/e-msg-composer.h>
#include <mail/em-composer-utils.h>
Modified: trunk/addressbook/gui/widgets/eab-gui-util.h
==============================================================================
--- trunk/addressbook/gui/widgets/eab-gui-util.h (original)
+++ trunk/addressbook/gui/widgets/eab-gui-util.h Fri Jun 6 15:12:53 2008
@@ -20,7 +20,7 @@
#ifndef __E_ADDRESSBOOK_UTIL_H__
#define __E_ADDRESSBOOK_UTIL_H__
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
#include <libebook/e-book.h>
#include "addressbook/gui/contact-editor/e-contact-editor.h"
#include "addressbook/gui/contact-list-editor/e-contact-list-editor.h"
Modified: trunk/addressbook/gui/widgets/eab-popup-control.c
==============================================================================
--- trunk/addressbook/gui/widgets/eab-popup-control.c (original)
+++ trunk/addressbook/gui/widgets/eab-popup-control.c Fri Jun 6 15:12:53 2008
@@ -33,18 +33,6 @@
#include <string.h>
#include "addressbook.h"
#include "eab-popup-control.h"
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtkhbbox.h>
-#include <gtk/gtkhseparator.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkoptionmenu.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtkvbox.h>
#include <bonobo/bonobo-control.h>
#include <bonobo/bonobo-property-bag.h>
#include <bonobo/bonobo-generic-factory.h>
Modified: trunk/addressbook/gui/widgets/eab-popup-control.h
==============================================================================
--- trunk/addressbook/gui/widgets/eab-popup-control.h (original)
+++ trunk/addressbook/gui/widgets/eab-popup-control.h Fri Jun 6 15:12:53 2008
@@ -32,7 +32,7 @@
#include <libebook/e-book.h>
#include <libebook/e-contact.h>
-#include <gtk/gtkeventbox.h>
+#include <gtk/gtk.h>
G_BEGIN_DECLS
Modified: trunk/addressbook/gui/widgets/gal-view-factory-minicard.h
==============================================================================
--- trunk/addressbook/gui/widgets/gal-view-factory-minicard.h (original)
+++ trunk/addressbook/gui/widgets/gal-view-factory-minicard.h Fri Jun 6 15:12:53 2008
@@ -10,7 +10,7 @@
#ifndef _GAL_VIEW_FACTORY_MINICARD_H_
#define _GAL_VIEW_FACTORY_MINICARD_H_
-#include <gtk/gtkobject.h>
+#include <glib-object.h>
#include <widgets/menus/gal-view-factory.h>
#define GAL_TYPE_VIEW_FACTORY_MINICARD (gal_view_factory_minicard_get_type ())
Modified: trunk/addressbook/importers/evolution-csv-importer.c
==============================================================================
--- trunk/addressbook/importers/evolution-csv-importer.c (original)
+++ trunk/addressbook/importers/evolution-csv-importer.c Fri Jun 6 15:12:53 2008
@@ -24,11 +24,10 @@
#include <ctype.h>
#include <string.h>
+#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <glib/gstdio.h>
-#include <gtk/gtkvbox.h>
-
#include <libebook/e-book.h>
#include <libedataserverui/e-source-selector.h>
Modified: trunk/addressbook/importers/evolution-ldif-importer.c
==============================================================================
--- trunk/addressbook/importers/evolution-ldif-importer.c (original)
+++ trunk/addressbook/importers/evolution-ldif-importer.c Fri Jun 6 15:12:53 2008
@@ -22,11 +22,10 @@
#include <ctype.h>
#include <string.h>
+#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <glib/gstdio.h>
-#include <gtk/gtkvbox.h>
-
#include <libebook/e-book.h>
#include <libedataserverui/e-source-selector.h>
Modified: trunk/addressbook/importers/evolution-vcard-importer.c
==============================================================================
--- trunk/addressbook/importers/evolution-vcard-importer.c (original)
+++ trunk/addressbook/importers/evolution-vcard-importer.c Fri Jun 6 15:12:53 2008
@@ -29,7 +29,7 @@
#include <stdio.h>
#include <string.h>
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <glib/gstdio.h>
Modified: trunk/addressbook/printing/e-contact-print-style-editor.h
==============================================================================
--- trunk/addressbook/printing/e-contact-print-style-editor.h (original)
+++ trunk/addressbook/printing/e-contact-print-style-editor.h Fri Jun 6 15:12:53 2008
@@ -21,7 +21,7 @@
#ifndef __E_CONTACT_PRINT_STYLE_EDITOR_H__
#define __E_CONTACT_PRINT_STYLE_EDITOR_H__
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
#include <glade/glade.h>
#ifdef __cplusplus
Modified: trunk/addressbook/printing/e-contact-print.c
==============================================================================
--- trunk/addressbook/printing/e-contact-print.c (original)
+++ trunk/addressbook/printing/e-contact-print.c Fri Jun 6 15:12:53 2008
@@ -26,8 +26,6 @@
#include <stdlib.h>
#include <string.h>
-#include <glib.h>
-
#include <libxml/tree.h>
#include <libxml/parser.h>
#include <libxml/xmlmemory.h>
@@ -36,7 +34,6 @@
#include <libebook/e-book.h>
#include <libebook/e-contact.h>
-#include <gtk/gtk.h>
#include <libedataserver/e-flag.h>
#include <libedataserver/e-xml-utils.h>
Modified: trunk/addressbook/printing/e-contact-print.h
==============================================================================
--- trunk/addressbook/printing/e-contact-print.h (original)
+++ trunk/addressbook/printing/e-contact-print.h Fri Jun 6 15:12:53 2008
@@ -22,8 +22,7 @@
#ifndef E_CONTACT_PRINT_H
#define E_CONTACT_PRINT_H
-#include <glib.h>
-#include <gtk/gtkprintoperation.h>
+#include <gtk/gtk.h>
#include <libebook/e-book.h>
#include "e-contact-print-types.h"
Modified: trunk/addressbook/printing/test-contact-print-style-editor.c
==============================================================================
--- trunk/addressbook/printing/test-contact-print-style-editor.c (original)
+++ trunk/addressbook/printing/test-contact-print-style-editor.c Fri Jun 6 15:12:53 2008
@@ -22,7 +22,7 @@
#include "config.h"
#include <stdlib.h>
-#include <gtk/gtkmain.h>
+#include <gtk/gtk.h>
#include <libgnomeui/gnome-app.h>
#include <libgnomeui/gnome-ui-init.h>
#include <bonobo/bonobo-main.h>
Modified: trunk/addressbook/printing/test-print.c
==============================================================================
--- trunk/addressbook/printing/test-print.c (original)
+++ trunk/addressbook/printing/test-print.c Fri Jun 6 15:12:53 2008
@@ -22,7 +22,7 @@
#include "config.h"
#include <stdlib.h>
-#include <gtk/gtkmain.h>
+#include <gtk/gtk.h>
#include <libgnomeui/gnome-dialog.h>
#include <libgnomeui/gnome-ui-init.h>
#include <glade/glade.h>
Modified: trunk/addressbook/tools/evolution-addressbook-export.c
==============================================================================
--- trunk/addressbook/tools/evolution-addressbook-export.c (original)
+++ trunk/addressbook/tools/evolution-addressbook-export.c Fri Jun 6 15:12:53 2008
@@ -28,7 +28,7 @@
#include <glib/gi18n.h>
#include <bonobo-activation/bonobo-activation.h>
#include <bonobo/bonobo-main.h>
-#include <gnome.h>
+#include <libgnome/gnome-init.h>
#include <libebook/e-book.h>
Modified: trunk/calendar/conduits/calendar/calendar-conduit.c
==============================================================================
--- trunk/calendar/conduits/calendar/calendar-conduit.c (original)
+++ trunk/calendar/conduits/calendar/calendar-conduit.c Fri Jun 6 15:12:53 2008
@@ -25,6 +25,8 @@
#define G_LOG_DOMAIN "ecalconduit"
+#include <glib/gi18n.h>
+#include <libgnome/gnome-config.h>
#include <libecal/e-cal-types.h>
#include <libecal/e-cal.h>
#include <libecal/e-cal-time-util.h>
Modified: trunk/calendar/conduits/common/libecalendar-common-conduit.c
==============================================================================
--- trunk/calendar/conduits/common/libecalendar-common-conduit.c (original)
+++ trunk/calendar/conduits/common/libecalendar-common-conduit.c Fri Jun 6 15:12:53 2008
@@ -67,6 +67,7 @@
categories */
if(strlen(category->name[i]) == 0){
int cat_to_add_len;
+ int desktopUniqueID;
cat_to_add_len = strlen(cat_to_add);
retval = i;
@@ -89,7 +90,6 @@
}
//find a desktop id that is not in use between 128 and 255
- int desktopUniqueID;
for (desktopUniqueID = 128; desktopUniqueID <= 255; desktopUniqueID++) {
int found = 0;
for(j=0; j<PILOT_MAX_CATEGORIES; j++){
Modified: trunk/calendar/conduits/memo/memo-conduit.c
==============================================================================
--- trunk/calendar/conduits/memo/memo-conduit.c (original)
+++ trunk/calendar/conduits/memo/memo-conduit.c Fri Jun 6 15:12:53 2008
@@ -28,6 +28,8 @@
#define G_LOG_DOMAIN "ememoconduit"
+#include <glib/gi18n.h>
+#include <libgnome/gnome-config.h>
#include <libecal/e-cal-types.h>
#include <libecal/e-cal.h>
#include <libecal/e-cal-time-util.h>
Modified: trunk/calendar/conduits/todo/todo-conduit.c
==============================================================================
--- trunk/calendar/conduits/todo/todo-conduit.c (original)
+++ trunk/calendar/conduits/todo/todo-conduit.c Fri Jun 6 15:12:53 2008
@@ -28,6 +28,8 @@
#define G_LOG_DOMAIN "etodoconduit"
+#include <glib/gi18n.h>
+#include <libgnome/gnome-config.h>
#include <libecal/e-cal-types.h>
#include <libecal/e-cal.h>
#include <libecal/e-cal-time-util.h>
Modified: trunk/calendar/gui/alarm-notify/alarm-notify-dialog.c
==============================================================================
--- trunk/calendar/gui/alarm-notify/alarm-notify-dialog.c (original)
+++ trunk/calendar/gui/alarm-notify/alarm-notify-dialog.c Fri Jun 6 15:12:53 2008
@@ -22,17 +22,6 @@
#include <config.h>
#include <stdio.h>
#include <string.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtk.h>
#include <glib/gi18n.h>
#if 0
# include <libgnomeui/gnome-winhints.h>
Modified: trunk/calendar/gui/alarm-notify/alarm-notify-dialog.h
==============================================================================
--- trunk/calendar/gui/alarm-notify/alarm-notify-dialog.h (original)
+++ trunk/calendar/gui/alarm-notify/alarm-notify-dialog.h Fri Jun 6 15:12:53 2008
@@ -22,12 +22,8 @@
#define ALARM_NOTIFY_DIALOG_H
#include <time.h>
-#include <glib.h>
+#include <gtk/gtk.h>
#include <libecal/e-cal-component.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtkliststore.h>
Modified: trunk/calendar/gui/alarm-notify/alarm-queue.c
==============================================================================
--- trunk/calendar/gui/alarm-notify/alarm-queue.c (original)
+++ trunk/calendar/gui/alarm-notify/alarm-queue.c Fri Jun 6 15:12:53 2008
@@ -28,23 +28,7 @@
#include <bonobo/bonobo-object.h>
#include <bonobo/bonobo-exception.h>
#include <bonobo/bonobo-main.h>
-#include <gtk/gtkbox.h>
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtkcheckmenuitem.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkeventbox.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkimagemenuitem.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkstatusicon.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtktooltips.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkversion.h>
+#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <libgnome/gnome-exec.h>
#include <libgnome/gnome-sound.h>
Modified: trunk/calendar/gui/alarm-notify/notify-main.c
==============================================================================
--- trunk/calendar/gui/alarm-notify/notify-main.c (original)
+++ trunk/calendar/gui/alarm-notify/notify-main.c Fri Jun 6 15:12:53 2008
@@ -25,8 +25,7 @@
#endif
#include <string.h>
-#include <glib.h>
-#include <gtk/gtkmain.h>
+#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <libgnome/gnome-init.h>
#include <libgnome/gnome-sound.h>
Modified: trunk/calendar/gui/cal-search-bar.c
==============================================================================
--- trunk/calendar/gui/cal-search-bar.c (original)
+++ trunk/calendar/gui/cal-search-bar.c Fri Jun 6 15:12:53 2008
@@ -24,11 +24,7 @@
#include <stdlib.h>
#include <string.h>
-#include <glib.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkoptionmenu.h>
-#include <gtk/gtksignal.h>
+#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <libedataserver/e-categories.h>
#include <libecal/e-cal-time-util.h>
Modified: trunk/calendar/gui/calendar-commands.c
==============================================================================
--- trunk/calendar/gui/calendar-commands.c (original)
+++ trunk/calendar/gui/calendar-commands.c Fri Jun 6 15:12:53 2008
@@ -35,14 +35,7 @@
#include <ctype.h>
#include <errno.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gtk/gtkfilesel.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtkmessagedialog.h>
-#include <libgnome/gnome-util.h>
+#include <gtk/gtk.h>
#include <libgnomeui/gnome-dialog-util.h>
#include <libgnomeui/gnome-messagebox.h>
#include <libgnomeui/gnome-stock-icons.h>
Modified: trunk/calendar/gui/comp-editor-factory.c
==============================================================================
--- trunk/calendar/gui/comp-editor-factory.c (original)
+++ trunk/calendar/gui/comp-editor-factory.c Fri Jun 6 15:12:53 2008
@@ -22,7 +22,7 @@
#include <config.h>
#endif
-#include <gtk/gtkmessagedialog.h>
+#include <gtk/gtk.h>
#include <bonobo/bonobo-exception.h>
#include <bonobo/bonobo-i18n.h>
#include <evolution-calendar.h>
Modified: trunk/calendar/gui/comp-util.h
==============================================================================
--- trunk/calendar/gui/comp-util.h (original)
+++ trunk/calendar/gui/comp-util.h Fri Jun 6 15:12:53 2008
@@ -22,9 +22,7 @@
#ifndef COMP_UTIL_H
#define COMP_UTIL_H
-#include <glib.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkselection.h>
+#include <gtk/gtk.h>
#include <libecal/e-cal-component.h>
#include <libecal/e-cal.h>
Modified: trunk/calendar/gui/dialogs/alarm-dialog.c
==============================================================================
--- trunk/calendar/gui/dialogs/alarm-dialog.c (original)
+++ trunk/calendar/gui/dialogs/alarm-dialog.c Fri Jun 6 15:12:53 2008
@@ -29,19 +29,8 @@
#endif
#include <string.h>
+#include <gtk/gtk.h>
#include <glib/gi18n.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkfilechooserbutton.h>
-#include <gtk/gtknotebook.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtkoptionmenu.h>
-#include <gtk/gtktextbuffer.h>
-#include <gtk/gtktextview.h>
-#include <gtk/gtktogglebutton.h>
#include <bonobo/bonobo-control.h>
#include <bonobo/bonobo-exception.h>
#include <bonobo/bonobo-widget.h>
Modified: trunk/calendar/gui/dialogs/alarm-list-dialog.c
==============================================================================
--- trunk/calendar/gui/dialogs/alarm-list-dialog.c (original)
+++ trunk/calendar/gui/dialogs/alarm-list-dialog.c Fri Jun 6 15:12:53 2008
@@ -29,13 +29,7 @@
#endif
#include <string.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtkoptionmenu.h>
+#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <glade/glade.h>
#include <libedataserver/e-time-utils.h>
Modified: trunk/calendar/gui/dialogs/cal-attachment-select-file.c
==============================================================================
--- trunk/calendar/gui/dialogs/cal-attachment-select-file.c (original)
+++ trunk/calendar/gui/dialogs/cal-attachment-select-file.c Fri Jun 6 15:12:53 2008
@@ -30,15 +30,7 @@
#include <config.h>
#endif
-#include <gtk/gtkbox.h>
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkversion.h>
-
-#include <gtk/gtkfilechooser.h>
-#include <gtk/gtkfilechooserdialog.h>
-#include <gtk/gtkstock.h>
+#include <gtk/gtk.h>
#include <libgnomeui/gnome-uidefs.h>
#include <glib/gi18n.h>
Modified: trunk/calendar/gui/dialogs/calendar-setup.c
==============================================================================
--- trunk/calendar/gui/dialogs/calendar-setup.c (original)
+++ trunk/calendar/gui/dialogs/calendar-setup.c Fri Jun 6 15:12:53 2008
@@ -25,10 +25,7 @@
#include <string.h>
-#include <gtk/gtkbox.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
#include <libedataserver/e-source.h>
#include <libedataserver/e-source-list.h>
Modified: trunk/calendar/gui/dialogs/cancel-comp.c
==============================================================================
--- trunk/calendar/gui/dialogs/cancel-comp.c (original)
+++ trunk/calendar/gui/dialogs/cancel-comp.c Fri Jun 6 15:12:53 2008
@@ -22,8 +22,7 @@
#include <config.h>
#endif
-#include <glib.h>
-#include <gtk/gtkmessagedialog.h>
+#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <libgnomeui/gnome-uidefs.h>
#include <e-util/e-icon-factory.h>
Modified: trunk/calendar/gui/dialogs/changed-comp.c
==============================================================================
--- trunk/calendar/gui/dialogs/changed-comp.c (original)
+++ trunk/calendar/gui/dialogs/changed-comp.c Fri Jun 6 15:12:53 2008
@@ -22,8 +22,6 @@
#include <config.h>
#endif
-#include <glib.h>
-#include <gtk/gtkmessagedialog.h>
#include <glib/gi18n.h>
#include <libgnomeui/gnome-uidefs.h>
#include <e-util/e-icon-factory.h>
Modified: trunk/calendar/gui/dialogs/changed-comp.h
==============================================================================
--- trunk/calendar/gui/dialogs/changed-comp.h (original)
+++ trunk/calendar/gui/dialogs/changed-comp.h Fri Jun 6 15:12:53 2008
@@ -21,8 +21,7 @@
#ifndef CHANGED_COMP_H
#define CHANGED_COMP_H
-#include <glib.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
#include <libecal/e-cal-component.h>
gboolean changed_component_dialog (GtkWindow *window, ECalComponent *comp, gboolean deleted, gboolean changed);
Modified: trunk/calendar/gui/dialogs/comp-editor-page.c
==============================================================================
--- trunk/calendar/gui/dialogs/comp-editor-page.c (original)
+++ trunk/calendar/gui/dialogs/comp-editor-page.c Fri Jun 6 15:12:53 2008
@@ -23,8 +23,6 @@
#endif
#include <glib/gi18n.h>
-#include <gtk/gtkmessagedialog.h>
-#include <gtk/gtksignal.h>
#include <libgnomeui/gnome-dialog.h>
#include <libgnomeui/gnome-dialog-util.h>
#include "comp-editor-page.h"
Modified: trunk/calendar/gui/dialogs/comp-editor-page.h
==============================================================================
--- trunk/calendar/gui/dialogs/comp-editor-page.h (original)
+++ trunk/calendar/gui/dialogs/comp-editor-page.h Fri Jun 6 15:12:53 2008
@@ -22,7 +22,7 @@
#define COMP_EDITOR_PAGE_H
#include <time.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
#include <libecal/e-cal-component.h>
#include <libecal/e-cal.h>
Modified: trunk/calendar/gui/dialogs/comp-editor-util.c
==============================================================================
--- trunk/calendar/gui/dialogs/comp-editor-util.c (original)
+++ trunk/calendar/gui/dialogs/comp-editor-util.c Fri Jun 6 15:12:53 2008
@@ -25,8 +25,6 @@
#include <ctype.h>
#include <string.h>
#include <libical/ical.h>
-#include <glib.h>
-#include <gtk/gtklabel.h>
#include <glib/gi18n.h>
#include <bonobo-activation/bonobo-activation.h>
#include <bonobo/bonobo-control.h>
Modified: trunk/calendar/gui/dialogs/comp-editor-util.h
==============================================================================
--- trunk/calendar/gui/dialogs/comp-editor-util.h (original)
+++ trunk/calendar/gui/dialogs/comp-editor-util.h Fri Jun 6 15:12:53 2008
@@ -21,7 +21,7 @@
#ifndef _COMP_EDITOR_UTIL_H_
#define _COMP_EDITOR_UTIL_H_
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
#include "comp-editor-page.h"
void comp_editor_dates (CompEditorPageDates *date, ECalComponent *comp);
Modified: trunk/calendar/gui/dialogs/comp-editor.c
==============================================================================
--- trunk/calendar/gui/dialogs/comp-editor.c (original)
+++ trunk/calendar/gui/dialogs/comp-editor.c Fri Jun 6 15:12:53 2008
@@ -27,14 +27,12 @@
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
-#include <glib.h>
+#include <glib/gi18n.h>
#include <glib/gstdio.h>
#include <gdk/gdkkeysyms.h>
-#include <gtk/gtkstock.h>
#include <bonobo/bonobo-ui-util.h>
#include <bonobo/bonobo-widget.h>
#include <libgnome/libgnome.h>
-#include <glib/gi18n.h>
#include <libgnomeui/gnome-uidefs.h>
#include <libgnomeui/gnome-dialog.h>
#include <libgnomeui/gnome-dialog-util.h>
Modified: trunk/calendar/gui/dialogs/copy-source-dialog.c
==============================================================================
--- trunk/calendar/gui/dialogs/copy-source-dialog.c (original)
+++ trunk/calendar/gui/dialogs/copy-source-dialog.c Fri Jun 6 15:12:53 2008
@@ -22,7 +22,6 @@
#include <config.h>
#endif
-#include <gtk/gtkmessagedialog.h>
#include <bonobo/bonobo-i18n.h>
#include "copy-source-dialog.h"
#include "select-source-dialog.h"
Modified: trunk/calendar/gui/dialogs/copy-source-dialog.h
==============================================================================
--- trunk/calendar/gui/dialogs/copy-source-dialog.h (original)
+++ trunk/calendar/gui/dialogs/copy-source-dialog.h Fri Jun 6 15:12:53 2008
@@ -21,7 +21,7 @@
#ifndef COPY_SOURCE_DIALOG_H
#define COPY_SOURCE_DIALOG_H
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
#include <libedataserver/e-source.h>
#include <libecal/e-cal.h>
#include <libecal/e-cal-util.h>
Modified: trunk/calendar/gui/dialogs/delete-comp.c
==============================================================================
--- trunk/calendar/gui/dialogs/delete-comp.c (original)
+++ trunk/calendar/gui/dialogs/delete-comp.c Fri Jun 6 15:12:53 2008
@@ -22,10 +22,6 @@
#include <config.h>
#endif
-#include <glib.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtk.h>
-#include <gtk/gtkmessagedialog.h>
#include <glib/gi18n.h>
#include <e-util/e-icon-factory.h>
#include "e-util/e-error.h"
Modified: trunk/calendar/gui/dialogs/delete-comp.h
==============================================================================
--- trunk/calendar/gui/dialogs/delete-comp.h (original)
+++ trunk/calendar/gui/dialogs/delete-comp.h Fri Jun 6 15:12:53 2008
@@ -21,7 +21,7 @@
#ifndef DELETE_COMP_H
#define DELETE_COMP_H
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
#include <libecal/e-cal-component.h>
gboolean delete_component_dialog (ECalComponent *comp,
Modified: trunk/calendar/gui/dialogs/delete-error.c
==============================================================================
--- trunk/calendar/gui/dialogs/delete-error.c (original)
+++ trunk/calendar/gui/dialogs/delete-error.c Fri Jun 6 15:12:53 2008
@@ -22,8 +22,7 @@
#include <config.h>
#endif
-#include <glib.h>
-#include <gtk/gtkmessagedialog.h>
+#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <libgnomeui/gnome-uidefs.h>
#include <e-util/e-icon-factory.h>
Modified: trunk/calendar/gui/dialogs/e-delegate-dialog.c
==============================================================================
--- trunk/calendar/gui/dialogs/e-delegate-dialog.c (original)
+++ trunk/calendar/gui/dialogs/e-delegate-dialog.c Fri Jun 6 15:12:53 2008
@@ -23,11 +23,7 @@
#include <config.h>
#endif
-#include <gtk/gtksignal.h>
-#include <gtk/gtkcombo.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtklabel.h>
-#include <gnome.h>
+#include <gtk/gtk.h>
#include <libical/ical.h>
#include <glade/glade.h>
#include <misc/e-map.h>
Modified: trunk/calendar/gui/dialogs/e-delegate-dialog.h
==============================================================================
--- trunk/calendar/gui/dialogs/e-delegate-dialog.h (original)
+++ trunk/calendar/gui/dialogs/e-delegate-dialog.h Fri Jun 6 15:12:53 2008
@@ -21,7 +21,7 @@
#ifndef __E_DELEGATE_DIALOG_H__
#define __E_DELEGATE_DIALOG_H__
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
Modified: trunk/calendar/gui/dialogs/event-editor.h
==============================================================================
--- trunk/calendar/gui/dialogs/event-editor.h (original)
+++ trunk/calendar/gui/dialogs/event-editor.h Fri Jun 6 15:12:53 2008
@@ -24,7 +24,7 @@
#ifndef __EVENT_EDITOR_H__
#define __EVENT_EDITOR_H__
-#include <gtk/gtkobject.h>
+#include <gtk/gtk.h>
#include "comp-editor.h"
Modified: trunk/calendar/gui/dialogs/event-page.c
==============================================================================
--- trunk/calendar/gui/dialogs/event-page.c (original)
+++ trunk/calendar/gui/dialogs/event-page.c Fri Jun 6 15:12:53 2008
@@ -26,13 +26,10 @@
#endif
#include <string.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtktextview.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkmessagedialog.h>
-#include <gdk/gdkkeysyms.h>
+#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <glade/glade.h>
+#include <gdk/gdkkeysyms.h>
#include <libedataserverui/e-source-combo-box.h>
#include "common/authentication.h"
#include "e-util/e-categories-config.h"
Modified: trunk/calendar/gui/dialogs/memo-editor.h
==============================================================================
--- trunk/calendar/gui/dialogs/memo-editor.h (original)
+++ trunk/calendar/gui/dialogs/memo-editor.h Fri Jun 6 15:12:53 2008
@@ -25,7 +25,7 @@
#ifndef __MEMO_EDITOR_H__
#define __MEMO_EDITOR_H__
-#include <gtk/gtkobject.h>
+#include <gtk/gtk.h>
#include "comp-editor.h"
#define TYPE_MEMO_EDITOR (memo_editor_get_type ())
Modified: trunk/calendar/gui/dialogs/memo-page.c
==============================================================================
--- trunk/calendar/gui/dialogs/memo-page.c (original)
+++ trunk/calendar/gui/dialogs/memo-page.c Fri Jun 6 15:12:53 2008
@@ -27,12 +27,7 @@
#endif
#include <string.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtktextview.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtkoptionmenu.h>
-#include <gtk/gtkmessagedialog.h>
+#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <glade/glade.h>
#include <libedataserverui/e-source-combo-box.h>
Modified: trunk/calendar/gui/dialogs/recur-comp.c
==============================================================================
--- trunk/calendar/gui/dialogs/recur-comp.c (original)
+++ trunk/calendar/gui/dialogs/recur-comp.c Fri Jun 6 15:12:53 2008
@@ -22,8 +22,6 @@
#include <config.h>
#endif
-#include <glib.h>
-#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <libgnomeui/gnome-uidefs.h>
#include "recur-comp.h"
Modified: trunk/calendar/gui/dialogs/recur-comp.h
==============================================================================
--- trunk/calendar/gui/dialogs/recur-comp.h (original)
+++ trunk/calendar/gui/dialogs/recur-comp.h Fri Jun 6 15:12:53 2008
@@ -21,7 +21,7 @@
#ifndef RECUR_COMP_H
#define RECUR_COMP_H
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
#include <libecal/e-cal.h>
#include <libecal/e-cal-component.h>
#include <libecal/e-cal-util.h>
Modified: trunk/calendar/gui/dialogs/recurrence-page.c
==============================================================================
--- trunk/calendar/gui/dialogs/recurrence-page.c (original)
+++ trunk/calendar/gui/dialogs/recurrence-page.c Fri Jun 6 15:12:53 2008
@@ -28,17 +28,7 @@
#include <config.h>
#endif
-#include <gtk/gtklabel.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkoptionmenu.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkstock.h>
+#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <glade/glade.h>
#include <libedataserver/e-time-utils.h>
Modified: trunk/calendar/gui/dialogs/save-comp.h
==============================================================================
--- trunk/calendar/gui/dialogs/save-comp.h (original)
+++ trunk/calendar/gui/dialogs/save-comp.h Fri Jun 6 15:12:53 2008
@@ -22,7 +22,7 @@
#ifndef SAVE_COMP_H
#define SAVE_COMP_H
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
#include <libecal/e-cal-component.h>
GtkResponseType save_component_dialog (GtkWindow *parent, ECalComponent *comp);
Modified: trunk/calendar/gui/dialogs/schedule-page.c
==============================================================================
--- trunk/calendar/gui/dialogs/schedule-page.c (original)
+++ trunk/calendar/gui/dialogs/schedule-page.c Fri Jun 6 15:12:53 2008
@@ -25,11 +25,7 @@
#include <config.h>
#endif
-#include <glib.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <libgnomeui/gnome-dialog-util.h>
#include <glade/glade.h>
Modified: trunk/calendar/gui/dialogs/select-source-dialog.c
==============================================================================
--- trunk/calendar/gui/dialogs/select-source-dialog.c (original)
+++ trunk/calendar/gui/dialogs/select-source-dialog.c Fri Jun 6 15:12:53 2008
@@ -23,7 +23,6 @@
#endif
#include <bonobo/bonobo-i18n.h>
-#include <gtk/gtkstock.h>
#include <e-util/e-icon-factory.h>
#include <libedataserverui/e-source-selector-dialog.h>
#include "select-source-dialog.h"
Modified: trunk/calendar/gui/dialogs/select-source-dialog.h
==============================================================================
--- trunk/calendar/gui/dialogs/select-source-dialog.h (original)
+++ trunk/calendar/gui/dialogs/select-source-dialog.h Fri Jun 6 15:12:53 2008
@@ -21,7 +21,7 @@
#ifndef SELECT_SOURCE_DIALOG_H
#define SELECT_SOURCE_DIALOG_H
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
#include <libedataserver/e-source.h>
#include <libecal/e-cal.h>
Modified: trunk/calendar/gui/dialogs/send-comp.c
==============================================================================
--- trunk/calendar/gui/dialogs/send-comp.c (original)
+++ trunk/calendar/gui/dialogs/send-comp.c Fri Jun 6 15:12:53 2008
@@ -22,7 +22,6 @@
#include <config.h>
#endif
-#include <gtk/gtkmessagedialog.h>
#include "e-util/e-error.h"
#include "send-comp.h"
Modified: trunk/calendar/gui/dialogs/send-comp.h
==============================================================================
--- trunk/calendar/gui/dialogs/send-comp.h (original)
+++ trunk/calendar/gui/dialogs/send-comp.h Fri Jun 6 15:12:53 2008
@@ -21,8 +21,7 @@
#ifndef SEND_COMP_H
#define SEND_COMP_H
-#include <glib.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
#include <libecal/e-cal.h>
#include <libecal/e-cal-component.h>
Modified: trunk/calendar/gui/dialogs/task-details-page.c
==============================================================================
--- trunk/calendar/gui/dialogs/task-details-page.c (original)
+++ trunk/calendar/gui/dialogs/task-details-page.c Fri Jun 6 15:12:53 2008
@@ -25,8 +25,7 @@
#include <config.h>
#endif
-#include <gtk/gtksignal.h>
-#include <gtk/gtktogglebutton.h>
+#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <glade/glade.h>
#include <misc/e-dateedit.h>
Modified: trunk/calendar/gui/dialogs/task-editor.h
==============================================================================
--- trunk/calendar/gui/dialogs/task-editor.h (original)
+++ trunk/calendar/gui/dialogs/task-editor.h Fri Jun 6 15:12:53 2008
@@ -24,7 +24,7 @@
#ifndef __TASK_EDITOR_H__
#define __TASK_EDITOR_H__
-#include <gtk/gtkobject.h>
+#include <gtk/gtk.h>
#include "comp-editor.h"
Modified: trunk/calendar/gui/dialogs/task-page.c
==============================================================================
--- trunk/calendar/gui/dialogs/task-page.c (original)
+++ trunk/calendar/gui/dialogs/task-page.c Fri Jun 6 15:12:53 2008
@@ -26,15 +26,10 @@
#endif
#include <string.h>
-#include <gdk/gdkkeysyms.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtktextview.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtkoptionmenu.h>
-#include <gtk/gtkmessagedialog.h>
+#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <glade/glade.h>
+#include <gdk/gdkkeysyms.h>
#include <libedataserverui/e-source-combo-box.h>
#include <misc/e-dateedit.h>
#include <e-util/e-dialog-utils.h>
Modified: trunk/calendar/gui/e-alarm-list.c
==============================================================================
--- trunk/calendar/gui/e-alarm-list.c (original)
+++ trunk/calendar/gui/e-alarm-list.c Fri Jun 6 15:12:53 2008
@@ -22,11 +22,7 @@
#include <config.h>
#include <string.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtktreednd.h>
#include <glib/gi18n.h>
-#include <glib.h>
#include <libecal/e-cal-time-util.h>
#include <libedataserver/e-time-utils.h>
#include "calendar-config.h"
Modified: trunk/calendar/gui/e-alarm-list.h
==============================================================================
--- trunk/calendar/gui/e-alarm-list.h (original)
+++ trunk/calendar/gui/e-alarm-list.h Fri Jun 6 15:12:53 2008
@@ -23,7 +23,7 @@
#ifndef E_ALARM_LIST_H
#define E_ALARM_LIST_H
-#include <gtk/gtktreemodel.h>
+#include <gtk/gtk.h>
#include <libecal/e-cal-component.h>
G_BEGIN_DECLS
Modified: trunk/calendar/gui/e-cal-component-memo-preview.c
==============================================================================
--- trunk/calendar/gui/e-cal-component-memo-preview.c (original)
+++ trunk/calendar/gui/e-cal-component-memo-preview.c Fri Jun 6 15:12:53 2008
@@ -28,9 +28,9 @@
#endif
#include <string.h>
-#include <gnome.h>
#include <gtk/gtk.h>
#include <glib/gi18n.h>
+#include <libgnome/gnome-url.h>
#include <libecal/e-cal-time-util.h>
#include <libedataserver/e-categories.h>
#include <gtkhtml/gtkhtml.h>
Modified: trunk/calendar/gui/e-cal-component-memo-preview.h
==============================================================================
--- trunk/calendar/gui/e-cal-component-memo-preview.h (original)
+++ trunk/calendar/gui/e-cal-component-memo-preview.h Fri Jun 6 15:12:53 2008
@@ -25,7 +25,7 @@
#ifndef _E_CAL_COMPONENT_MEMO_PREVIEW_H_
#define _E_CAL_COMPONENT_MEMO_PREVIEW_H_
-#include <gtk/gtktable.h>
+#include <gtk/gtk.h>
#include <libecal/e-cal.h>
#define E_TYPE_CAL_COMPONENT_MEMO_PREVIEW (e_cal_component_memo_preview_get_type ())
Modified: trunk/calendar/gui/e-cal-component-preview.c
==============================================================================
--- trunk/calendar/gui/e-cal-component-preview.c (original)
+++ trunk/calendar/gui/e-cal-component-preview.c Fri Jun 6 15:12:53 2008
@@ -27,10 +27,9 @@
#endif
#include <string.h>
-#include <gnome.h>
-#include <gio/gio.h>
#include <gtk/gtk.h>
#include <glib/gi18n.h>
+#include <libgnome/gnome-url.h>
#include <libedataserver/e-categories.h>
#include <libecal/e-cal-time-util.h>
#include <gtkhtml/gtkhtml.h>
Modified: trunk/calendar/gui/e-cal-component-preview.h
==============================================================================
--- trunk/calendar/gui/e-cal-component-preview.h (original)
+++ trunk/calendar/gui/e-cal-component-preview.h Fri Jun 6 15:12:53 2008
@@ -24,7 +24,7 @@
#ifndef _E_CAL_COMPONENT_PREVIEW_H_
#define _E_CAL_COMPONENT_PREVIEW_H_
-#include <gtk/gtktable.h>
+#include <gtk/gtk.h>
#include <libecal/e-cal.h>
#include <gtkhtml/gtkhtml.h>
#include <gtkhtml/gtkhtml-stream.h>
Modified: trunk/calendar/gui/e-cal-config.c
==============================================================================
--- trunk/calendar/gui/e-cal-config.c (original)
+++ trunk/calendar/gui/e-cal-config.c Fri Jun 6 15:12:53 2008
@@ -23,7 +23,7 @@
#include <config.h>
#endif
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
#include "e-cal-config.h"
static GObjectClass *ecp_parent_class;
Modified: trunk/calendar/gui/e-cal-list-view.c
==============================================================================
--- trunk/calendar/gui/e-cal-list-view.c (original)
+++ trunk/calendar/gui/e-cal-list-view.c Fri Jun 6 15:12:53 2008
@@ -35,13 +35,10 @@
#include <math.h>
#include <time.h>
#include <sys/stat.h>
-#include <gdk/gdkkeysyms.h>
-#include <gtk/gtkdnd.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkvscrollbar.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
#include <glib/gstdio.h>
+#include <gdk/gdkkeysyms.h>
#include <misc/e-gui-utils.h>
#include <table/e-table-memory-store.h>
#include <table/e-cell-checkbox.h>
@@ -50,7 +47,6 @@
#include <table/e-cell-combo.h>
#include <misc/e-popup-menu.h>
#include <misc/e-cell-date-edit.h>
-#include <glib/gi18n.h>
#include <libgnome/gnome-exec.h>
#include <libgnome/gnome-util.h>
#include <e-util/e-categories-config.h>
Modified: trunk/calendar/gui/e-cal-list-view.h
==============================================================================
--- trunk/calendar/gui/e-cal-list-view.h (original)
+++ trunk/calendar/gui/e-cal-list-view.h Fri Jun 6 15:12:53 2008
@@ -24,8 +24,7 @@
#define _E_CAL_LIST_VIEW_H_
#include <time.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtktooltips.h>
+#include <gtk/gtk.h>
#include "e-calendar-view.h"
#include "gnome-cal.h"
Modified: trunk/calendar/gui/e-cal-model-tasks.c
==============================================================================
--- trunk/calendar/gui/e-cal-model-tasks.c (original)
+++ trunk/calendar/gui/e-cal-model-tasks.c Fri Jun 6 15:12:53 2008
@@ -24,7 +24,7 @@
#include <math.h>
#include <string.h>
-#include <gtk/gtkmessagedialog.h>
+#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <libedataserver/e-data-server-util.h>
#include "calendar-config.h"
Modified: trunk/calendar/gui/e-cal-model.c
==============================================================================
--- trunk/calendar/gui/e-cal-model.c (original)
+++ trunk/calendar/gui/e-cal-model.c Fri Jun 6 15:12:53 2008
@@ -23,7 +23,7 @@
#endif
#include <string.h>
-#include <glib/garray.h>
+#include <glib.h>
#include <glib/gi18n.h>
#include <libedataserver/e-time-utils.h>
#include <libecal/e-cal-time-util.h>
Modified: trunk/calendar/gui/e-calendar-table.h
==============================================================================
--- trunk/calendar/gui/e-calendar-table.h (original)
+++ trunk/calendar/gui/e-calendar-table.h Fri Jun 6 15:12:53 2008
@@ -24,7 +24,7 @@
#ifndef _E_CALENDAR_TABLE_H_
#define _E_CALENDAR_TABLE_H_
-#include <gtk/gtktable.h>
+#include <gtk/gtk.h>
#include <table/e-table-scrolled.h>
#include <misc/e-cell-date-edit.h>
#include "e-activity-handler.h"
Modified: trunk/calendar/gui/e-calendar-view.c
==============================================================================
--- trunk/calendar/gui/e-calendar-view.c (original)
+++ trunk/calendar/gui/e-calendar-view.c Fri Jun 6 15:12:53 2008
@@ -27,17 +27,10 @@
#include <string.h>
#include <time.h>
-#include <glib.h>
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
#include <glib/gstdio.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkstock.h>
#include <gdk/gdkkeysyms.h>
-#include <gtk/gtkbindings.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkbox.h>
-#include <gtk/gtkcontainer.h>
-#include <gtk/gtkwindow.h>
-#include <glib/gi18n.h>
#include <libedataserver/e-time-utils.h>
#include <e-util/e-error.h>
#include <e-util/e-dialog-utils.h>
Modified: trunk/calendar/gui/e-calendar-view.h
==============================================================================
--- trunk/calendar/gui/e-calendar-view.h (original)
+++ trunk/calendar/gui/e-calendar-view.h Fri Jun 6 15:12:53 2008
@@ -24,8 +24,7 @@
#define _E_CALENDAR_VIEW_H_
#include <libecal/e-cal.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
#include "e-cal-model.h"
#include "gnome-cal.h"
Modified: trunk/calendar/gui/e-date-time-list.c
==============================================================================
--- trunk/calendar/gui/e-date-time-list.c (original)
+++ trunk/calendar/gui/e-date-time-list.c Fri Jun 6 15:12:53 2008
@@ -21,10 +21,6 @@
*/
#include <string.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtktreednd.h>
-#include <glib.h>
#include <libedataserver/e-time-utils.h>
#include "e-date-time-list.h"
#include <libecal/e-cal-time-util.h>
Modified: trunk/calendar/gui/e-date-time-list.h
==============================================================================
--- trunk/calendar/gui/e-date-time-list.h (original)
+++ trunk/calendar/gui/e-date-time-list.h Fri Jun 6 15:12:53 2008
@@ -23,7 +23,7 @@
#ifndef E_DATE_TIME_LIST_H
#define E_DATE_TIME_LIST_H
-#include <gtk/gtktreemodel.h>
+#include <gtk/gtk.h>
#include <libecal/e-cal-component.h>
G_BEGIN_DECLS
Modified: trunk/calendar/gui/e-day-view-time-item.c
==============================================================================
--- trunk/calendar/gui/e-day-view-time-item.c (original)
+++ trunk/calendar/gui/e-day-view-time-item.c Fri Jun 6 15:12:53 2008
@@ -32,10 +32,7 @@
#endif
#include <string.h>
-#include <glib.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkradiomenuitem.h>
-#include <gtk/gtkcheckmenuitem.h>
+#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <misc/e-gui-utils.h>
#include "e-day-view-time-item.h"
Modified: trunk/calendar/gui/e-day-view.c
==============================================================================
--- trunk/calendar/gui/e-day-view.c (original)
+++ trunk/calendar/gui/e-day-view.c Fri Jun 6 15:12:53 2008
@@ -35,11 +35,6 @@
#include <math.h>
#include <time.h>
#include <gdk/gdkkeysyms.h>
-#include <gtk/gtkdnd.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkvscrollbar.h>
-#include <gtk/gtkwindow.h>
#include <text/e-text.h>
#include <misc/e-canvas-utils.h>
#include <misc/e-popup-menu.h>
Modified: trunk/calendar/gui/e-day-view.h
==============================================================================
--- trunk/calendar/gui/e-day-view.h (original)
+++ trunk/calendar/gui/e-day-view.h Fri Jun 6 15:12:53 2008
@@ -25,8 +25,7 @@
#define _E_DAY_VIEW_H_
#include <time.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtktooltips.h>
+#include <gtk/gtk.h>
#include <libgnomecanvas/gnome-canvas.h>
#include "e-calendar-view.h"
Modified: trunk/calendar/gui/e-itip-control.c
==============================================================================
--- trunk/calendar/gui/e-itip-control.c (original)
+++ trunk/calendar/gui/e-itip-control.c Fri Jun 6 15:12:53 2008
@@ -29,10 +29,8 @@
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
-#include <glib.h>
-#include <glib/gstdio.h>
-#include <gtk/gtkmisc.h>
#include <glib/gi18n.h>
+#include <glib/gstdio.h>
#include <libgnome/gnome-util.h>
#include <libgnomeui/gnome-stock-icons.h>
#include <libgnomeui/gnome-uidefs.h>
Modified: trunk/calendar/gui/e-meeting-list-view.c
==============================================================================
--- trunk/calendar/gui/e-meeting-list-view.c (original)
+++ trunk/calendar/gui/e-meeting-list-view.c Fri Jun 6 15:12:53 2008
@@ -26,8 +26,7 @@
#endif
#include <string.h>
-#include <glib.h>
-#include <gtk/gtktreemodel.h>
+#include <gtk/gtk.h>
#include <bonobo/bonobo-control.h>
#include <bonobo/bonobo-widget.h>
#include <bonobo/bonobo-exception.h>
Modified: trunk/calendar/gui/e-meeting-list-view.h
==============================================================================
--- trunk/calendar/gui/e-meeting-list-view.h (original)
+++ trunk/calendar/gui/e-meeting-list-view.h Fri Jun 6 15:12:53 2008
@@ -23,7 +23,7 @@
#ifndef _E_MEETING_LIST_VIEW_H_
#define _E_MEETING_LIST_VIEW_H_
-#include <gtk/gtktreeview.h>
+#include <gtk/gtk.h>
#include "e-meeting-store.h"
#include <libedataserverui/e-name-selector.h>
Modified: trunk/calendar/gui/e-meeting-store.c
==============================================================================
--- trunk/calendar/gui/e-meeting-store.c (original)
+++ trunk/calendar/gui/e-meeting-store.c Fri Jun 6 15:12:53 2008
@@ -25,10 +25,8 @@
#include <config.h>
#endif
-#include <glib.h>
#include <glib/gi18n.h>
#include <libgnome/gnome-util.h>
-#include <gio/gio.h>
#include <libecal/e-cal-component.h>
#include <libecal/e-cal-util.h>
#include <libecal/e-cal-time-util.h>
Modified: trunk/calendar/gui/e-meeting-store.h
==============================================================================
--- trunk/calendar/gui/e-meeting-store.h (original)
+++ trunk/calendar/gui/e-meeting-store.h Fri Jun 6 15:12:53 2008
@@ -23,7 +23,7 @@
#ifndef _E_MEETING_STORE_H_
#define _E_MEETING_STORE_H_
-#include <gtk/gtkliststore.h>
+#include <gtk/gtk.h>
#include <libecal/e-cal.h>
#include "e-meeting-attendee.h"
Modified: trunk/calendar/gui/e-meeting-time-sel.c
==============================================================================
--- trunk/calendar/gui/e-meeting-time-sel.c (original)
+++ trunk/calendar/gui/e-meeting-time-sel.c Fri Jun 6 15:12:53 2008
@@ -33,23 +33,7 @@
#include <stdio.h>
#include <string.h>
#include <time.h>
-#include <glib.h>
#include <gdk/gdkkeysyms.h>
-#include <gtk/gtkalignment.h>
-#include <gtk/gtkarrow.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkdrawingarea.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkfixed.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkhscrollbar.h>
-#include <gtk/gtkhseparator.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkradiomenuitem.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkvscrollbar.h>
#include <libgnomeui/gnome-dateedit.h>
#include <glib/gi18n.h>
#include <libgnomecanvas/gnome-canvas-widget.h>
Modified: trunk/calendar/gui/e-meeting-time-sel.h
==============================================================================
--- trunk/calendar/gui/e-meeting-time-sel.h (original)
+++ trunk/calendar/gui/e-meeting-time-sel.h Fri Jun 6 15:12:53 2008
@@ -23,10 +23,7 @@
#ifndef _E_MEETING_TIME_SELECTOR_H_
#define _E_MEETING_TIME_SELECTOR_H_
-#include <glib.h>
-#include <gtk/gtkaccelgroup.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
#include <libgnomecanvas/gnome-canvas.h>
#include <text/e-text.h>
#include <table/e-table-model.h>
Modified: trunk/calendar/gui/e-memo-table.c
==============================================================================
--- trunk/calendar/gui/e-memo-table.c (original)
+++ trunk/calendar/gui/e-memo-table.c Fri Jun 6 15:12:53 2008
@@ -34,10 +34,10 @@
#include <sys/stat.h>
#include <unistd.h>
-#include <glib.h>
#include <glib/gi18n.h>
#include <glib/gstdio.h>
-#include <gnome.h>
+#include <gdk/gdkkeysyms.h>
+#include <libgnome/gnome-url.h>
#include <widgets/misc/e-gui-utils.h>
#include <table/e-cell-checkbox.h>
#include <table/e-cell-toggle.h>
Modified: trunk/calendar/gui/e-memo-table.h
==============================================================================
--- trunk/calendar/gui/e-memo-table.h (original)
+++ trunk/calendar/gui/e-memo-table.h Fri Jun 6 15:12:53 2008
@@ -25,7 +25,7 @@
#ifndef _E_MEMO_TABLE_H_
#define _E_MEMO_TABLE_H_
-#include <gtk/gtktable.h>
+#include <gtk/gtk.h>
#include <table/e-table-scrolled.h>
#include <widgets/misc/e-cell-date-edit.h>
#include "e-activity-handler.h"
Modified: trunk/calendar/gui/e-memos.c
==============================================================================
--- trunk/calendar/gui/e-memos.c (original)
+++ trunk/calendar/gui/e-memos.c Fri Jun 6 15:12:53 2008
@@ -28,7 +28,6 @@
#endif
#include <string.h>
-#include <gnome.h>
#include <glib/gi18n.h>
#include <libedataserver/e-time-utils.h>
#include <table/e-table-scrolled.h>
Modified: trunk/calendar/gui/e-memos.h
==============================================================================
--- trunk/calendar/gui/e-memos.h (original)
+++ trunk/calendar/gui/e-memos.h Fri Jun 6 15:12:53 2008
@@ -27,7 +27,7 @@
#define _E_MEMOS_H_
#include <bonobo/bonobo-ui-component.h>
-#include <gtk/gtktable.h>
+#include <gtk/gtk.h>
#include <libedataserver/e-source.h>
#include <libecal/e-cal.h>
#include "e-memo-table.h"
Modified: trunk/calendar/gui/e-select-names-editable.c
==============================================================================
--- trunk/calendar/gui/e-select-names-editable.c (original)
+++ trunk/calendar/gui/e-select-names-editable.c Fri Jun 6 15:12:53 2008
@@ -21,8 +21,8 @@
*/
#include <config.h>
+#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
-#include <gtk/gtkcelleditable.h>
#include <libebook/e-destination.h>
#include <libedataserverui/e-name-selector-entry.h>
Modified: trunk/calendar/gui/e-select-names-renderer.c
==============================================================================
--- trunk/calendar/gui/e-select-names-renderer.c (original)
+++ trunk/calendar/gui/e-select-names-renderer.c Fri Jun 6 15:12:53 2008
@@ -21,7 +21,6 @@
*/
#include <config.h>
-#include <gtk/gtkcellrenderertext.h>
#include "e-calendar-marshal.h"
Modified: trunk/calendar/gui/e-select-names-renderer.h
==============================================================================
--- trunk/calendar/gui/e-select-names-renderer.h (original)
+++ trunk/calendar/gui/e-select-names-renderer.h Fri Jun 6 15:12:53 2008
@@ -23,7 +23,7 @@
#ifndef __E_SELECT_NAMES_RENDERER_H__
#define __E_SELECT_NAMES_RENDERER_H__
-#include <gtk/gtkcellrenderertext.h>
+#include <gtk/gtk.h>
G_BEGIN_DECLS
Modified: trunk/calendar/gui/e-tasks.c
==============================================================================
--- trunk/calendar/gui/e-tasks.c (original)
+++ trunk/calendar/gui/e-tasks.c Fri Jun 6 15:12:53 2008
@@ -26,7 +26,6 @@
#include <config.h>
#endif
-#include <gnome.h>
#include <glib/gi18n.h>
#include <libedataserver/e-time-utils.h>
#include <table/e-table-scrolled.h>
Modified: trunk/calendar/gui/e-tasks.h
==============================================================================
--- trunk/calendar/gui/e-tasks.h (original)
+++ trunk/calendar/gui/e-tasks.h Fri Jun 6 15:12:53 2008
@@ -26,7 +26,7 @@
#define _E_TASKS_H_
#include <bonobo/bonobo-ui-component.h>
-#include <gtk/gtktable.h>
+#include <gtk/gtk.h>
#include <libedataserver/e-source.h>
#include <libecal/e-cal.h>
#include "e-calendar-table.h"
Modified: trunk/calendar/gui/e-timezone-entry.c
==============================================================================
--- trunk/calendar/gui/e-timezone-entry.c (original)
+++ trunk/calendar/gui/e-timezone-entry.c Fri Jun 6 15:12:53 2008
@@ -30,10 +30,6 @@
*/
#include <config.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtksignal.h>
-#include <gnome.h>
#include <widgets/e-timezone-dialog/e-timezone-dialog.h>
#include <glib/gi18n.h>
#include "e-timezone-entry.h"
Modified: trunk/calendar/gui/e-timezone-entry.h
==============================================================================
--- trunk/calendar/gui/e-timezone-entry.h (original)
+++ trunk/calendar/gui/e-timezone-entry.h Fri Jun 6 15:12:53 2008
@@ -32,7 +32,7 @@
#ifndef __E_TIMEZONE_ENTRY_H_
#define __E_TIMEZONE_ENTRY_H_
-#include <gtk/gtkhbox.h>
+#include <gtk/gtk.h>
#include <libecal/e-cal.h>
G_BEGIN_DECLS
Modified: trunk/calendar/gui/e-week-view.c
==============================================================================
--- trunk/calendar/gui/e-week-view.c (original)
+++ trunk/calendar/gui/e-week-view.c Fri Jun 6 15:12:53 2008
@@ -36,15 +36,9 @@
#include <math.h>
#include <gdk/gdkkeysyms.h>
-#include <gtk/gtkselection.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkvscrollbar.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkmain.h>
#include <glib/gi18n.h>
#include <libgnome/gnome-exec.h>
#include <libgnome/gnome-util.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
#include <libgnomecanvas/gnome-canvas-pixbuf.h>
#include <text/e-text.h>
#include <misc/e-canvas-utils.h>
Modified: trunk/calendar/gui/e-week-view.h
==============================================================================
--- trunk/calendar/gui/e-week-view.h (original)
+++ trunk/calendar/gui/e-week-view.h Fri Jun 6 15:12:53 2008
@@ -24,7 +24,7 @@
#ifndef _E_WEEK_VIEW_H_
#define _E_WEEK_VIEW_H_
-#include <gtk/gtktable.h>
+#include <gtk/gtk.h>
#include <libgnomecanvas/gnome-canvas.h>
#include "e-calendar-view.h"
Modified: trunk/calendar/gui/gnome-cal.c
==============================================================================
--- trunk/calendar/gui/gnome-cal.c (original)
+++ trunk/calendar/gui/gnome-cal.c Fri Jun 6 15:12:53 2008
@@ -35,7 +35,6 @@
#include <fcntl.h>
#include <glib.h>
#include <gdk/gdkkeysyms.h>
-#include <gtk/gtkbindings.h>
#include <glib/gi18n.h>
#include <libgnome/gnome-util.h>
#include <libgnomeui/gnome-dialog.h>
Modified: trunk/calendar/gui/gnome-cal.h
==============================================================================
--- trunk/calendar/gui/gnome-cal.h (original)
+++ trunk/calendar/gui/gnome-cal.h Fri Jun 6 15:12:53 2008
@@ -26,7 +26,7 @@
#define GNOME_CALENDAR_APP_H
#include <time.h>
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
#include <bonobo/bonobo-ui-component.h>
#include <misc/e-calendar.h>
#include <libecal/e-cal.h>
Modified: trunk/calendar/gui/goto.c
==============================================================================
--- trunk/calendar/gui/goto.c (original)
+++ trunk/calendar/gui/goto.c Fri Jun 6 15:12:53 2008
@@ -9,13 +9,7 @@
*/
#include <config.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkoptionmenu.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
#include <libgnomeui/gnome-dialog.h>
#include <glade/glade.h>
#include "e-util/e-util-private.h"
Modified: trunk/calendar/gui/itip-bonobo-control.c
==============================================================================
--- trunk/calendar/gui/itip-bonobo-control.c (original)
+++ trunk/calendar/gui/itip-bonobo-control.c Fri Jun 6 15:12:53 2008
@@ -22,9 +22,7 @@
#include <config.h>
#include <string.h>
-#include <glib.h>
-#include <gtk/gtkobject.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
#include <bonobo/bonobo-generic-factory.h>
#include <bonobo/bonobo-control.h>
#include <bonobo/bonobo-property-bag.h>
Modified: trunk/calendar/gui/itip-utils.c
==============================================================================
--- trunk/calendar/gui/itip-utils.c (original)
+++ trunk/calendar/gui/itip-utils.c Fri Jun 6 15:12:53 2008
@@ -26,8 +26,7 @@
#include <glib/gi18n.h>
#include <libedataserver/e-time-utils.h>
-#include <gtk/gtkmessagedialog.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
#include <libical/ical.h>
#include <e-util/e-dialog-utils.h>
#include <libecal/e-cal-time-util.h>
Modified: trunk/calendar/gui/memos-control.c
==============================================================================
--- trunk/calendar/gui/memos-control.c (original)
+++ trunk/calendar/gui/memos-control.c Fri Jun 6 15:12:53 2008
@@ -26,10 +26,7 @@
#include <config.h>
#endif
-#include <gtk/gtksignal.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtkmessagedialog.h>
+#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <libgnome/gnome-util.h>
#include <libgnomeui/gnome-dialog.h>
Modified: trunk/calendar/gui/migration.c
==============================================================================
--- trunk/calendar/gui/migration.c (original)
+++ trunk/calendar/gui/migration.c Fri Jun 6 15:12:53 2008
@@ -29,15 +29,10 @@
#include <fcntl.h>
#include <errno.h>
-#include <glib.h>
+#include <gtk/gtk.h>
#include <glib/gstdio.h>
#include <bonobo/bonobo-i18n.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkprogressbar.h>
#include <libecal/e-cal.h>
#include <libebackend/e-dbhash.h>
Modified: trunk/calendar/gui/tasks-control.c
==============================================================================
--- trunk/calendar/gui/tasks-control.c (original)
+++ trunk/calendar/gui/tasks-control.c Fri Jun 6 15:12:53 2008
@@ -25,10 +25,7 @@
#include <config.h>
#endif
-#include <gtk/gtksignal.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtkmessagedialog.h>
+#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <libgnome/gnome-util.h>
#include <libgnomeui/gnome-dialog.h>
Modified: trunk/calendar/importers/icalendar-importer.c
==============================================================================
--- trunk/calendar/importers/icalendar-importer.c (original)
+++ trunk/calendar/importers/icalendar-importer.c Fri Jun 6 15:12:53 2008
@@ -31,13 +31,7 @@
#include <sys/types.h>
#include <fcntl.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkradiobutton.h>
-#include <gtk/gtknotebook.h>
-#include <gtk/gtkscrolledwindow.h>
+#include <gtk/gtk.h>
#include <libecal/e-cal.h>
#include <libedataserverui/e-source-selector.h>
Modified: trunk/e-util/e-categories-config.c
==============================================================================
--- trunk/e-util/e-categories-config.c (original)
+++ trunk/e-util/e-categories-config.c Fri Jun 6 15:12:53 2008
@@ -9,9 +9,8 @@
*/
#include <string.h>
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
#include <glib/gi18n.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
#include <libedataserver/e-categories.h>
#include <libedataserverui/e-categories-dialog.h>
#include "e-categories-config.h"
Modified: trunk/e-util/e-categories-config.h
==============================================================================
--- trunk/e-util/e-categories-config.h (original)
+++ trunk/e-util/e-categories-config.h Fri Jun 6 15:12:53 2008
@@ -11,9 +11,7 @@
#ifndef __E_CATEGORIES_CONFIG_H__
#define __E_CATEGORIES_CONFIG_H__
-#include <glib.h>
-#include <gdk/gdk.h>
-#include <gtk/gtkentry.h>
+#include <gtk/gtk.h>
G_BEGIN_DECLS
Modified: trunk/e-util/e-config.c
==============================================================================
--- trunk/e-util/e-config.c (original)
+++ trunk/e-util/e-config.c Fri Jun 6 15:12:53 2008
@@ -27,15 +27,7 @@
#include <string.h>
#include <stdlib.h>
-#include <glib.h>
-
-#include <gtk/gtknotebook.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtkalignment.h>
+#include <gtk/gtk.h>
#include <libgnomeui/gnome-druid.h>
#include <libgnomeui/gnome-druid-page-standard.h>
Modified: trunk/e-util/e-dialog-utils.c
==============================================================================
--- trunk/e-util/e-dialog-utils.c (original)
+++ trunk/e-util/e-dialog-utils.c Fri Jun 6 15:12:53 2008
@@ -29,22 +29,12 @@
#include "e-dialog-utils.h"
#include <unistd.h>
-#include <glib.h>
#include <glib/gstdio.h>
-#include <gdkconfig.h>
#ifdef GDK_WINDOWING_X11
#include <gdk/gdkx.h>
#endif
-#include <gtk/gtkmain.h>
-#include <gtk/gtkplug.h>
-#include <gtk/gtkversion.h>
-
-#include <gtk/gtkfilechooser.h>
-#include <gtk/gtkfilechooserdialog.h>
-#include <gtk/gtkstock.h>
-
#include <gconf/gconf-client.h>
#include <glib/gi18n.h>
#include <libgnome/gnome-util.h>
Modified: trunk/e-util/e-dialog-utils.h
==============================================================================
--- trunk/e-util/e-dialog-utils.h (original)
+++ trunk/e-util/e-dialog-utils.h Fri Jun 6 15:12:53 2008
@@ -23,8 +23,7 @@
#ifndef E_DIALOG_UTILS_H
#define E_DIALOG_UTILS_H
-#include <gtk/gtkmessagedialog.h>
-#include <gtk/gtkfilechooser.h>
+#include <gtk/gtk.h>
void e_notice (gpointer parent,
GtkMessageType type,
Modified: trunk/e-util/e-dialog-widgets.c
==============================================================================
--- trunk/e-util/e-dialog-widgets.c (original)
+++ trunk/e-util/e-dialog-widgets.c Fri Jun 6 15:12:53 2008
@@ -25,13 +25,7 @@
#include <math.h>
#include <string.h>
#include <time.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkoptionmenu.h>
-#include <gtk/gtkcombobox.h>
-#include <gtk/gtkradiobutton.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkspinbutton.h>
+#include <gtk/gtk.h>
#include <libgnomeui/gnome-dateedit.h>
#include "e-dialog-widgets.h"
Modified: trunk/e-util/e-error.c
==============================================================================
--- trunk/e-util/e-error.c (original)
+++ trunk/e-util/e-error.c Fri Jun 6 15:12:53 2008
@@ -27,16 +27,7 @@
#include <libxml/parser.h>
#include <libxml/xmlmemory.h>
-#include <glib.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <libgnome/gnome-url.h>
Modified: trunk/e-util/e-event.c
==============================================================================
--- trunk/e-util/e-event.c (original)
+++ trunk/e-util/e-event.c Fri Jun 6 15:12:53 2008
@@ -27,16 +27,7 @@
#include <string.h>
#include <stdlib.h>
-#include <glib.h>
-
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkimagemenuitem.h>
-#include <gtk/gtkcheckmenuitem.h>
-#include <gtk/gtkradiomenuitem.h>
-#include <gtk/gtkseparatormenuitem.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkimage.h>
+#include <gtk/gtk.h>
#include "e-event.h"
Modified: trunk/e-util/e-gui-utils.c
==============================================================================
--- trunk/e-util/e-gui-utils.c (original)
+++ trunk/e-util/e-gui-utils.c Fri Jun 6 15:12:53 2008
@@ -20,14 +20,6 @@
#include "e-gui-utils.h"
#include <e-util/e-icon-factory.h>
-#include <glib.h>
-#include <gtk/gtkalignment.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkicontheme.h>
-
#include <libgnome/gnome-program.h>
#include <libgnomeui/gnome-icon-lookup.h>
Modified: trunk/e-util/e-gui-utils.h
==============================================================================
--- trunk/e-util/e-gui-utils.h (original)
+++ trunk/e-util/e-gui-utils.h Fri Jun 6 15:12:53 2008
@@ -1,7 +1,7 @@
#ifndef E_GUI_UTILS_H
#define E_GUI_UTILS_H
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
GdkPixbuf *e_icon_for_mime_type (const char *mime_type, int size);
GtkWidget *e_create_image_widget (gchar *name, gchar *string1, gchar *string2, gint int1, gint int2);
Modified: trunk/e-util/e-icon-factory.c
==============================================================================
--- trunk/e-util/e-icon-factory.c (original)
+++ trunk/e-util/e-icon-factory.c Fri Jun 6 15:12:53 2008
@@ -30,8 +30,6 @@
#include <pthread.h>
-#include <gtk/gtkicontheme.h>
-#include <gtk/gtkimage.h>
#ifdef HAVE_LIBGNOMEUI_GNOME_THUMBNAIL_H
#include <libgnomeui/gnome-thumbnail.h>
#endif
Modified: trunk/e-util/e-icon-factory.h
==============================================================================
--- trunk/e-util/e-icon-factory.h (original)
+++ trunk/e-util/e-icon-factory.h Fri Jun 6 15:12:53 2008
@@ -23,8 +23,7 @@
#ifndef _E_ICON_FACTORY_H_
#define _E_ICON_FACTORY_H_
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
enum {
E_ICON_SIZE_MENU,
Modified: trunk/e-util/e-import.c
==============================================================================
--- trunk/e-util/e-import.c (original)
+++ trunk/e-util/e-import.c Fri Jun 6 15:12:53 2008
@@ -27,15 +27,7 @@
#include <string.h>
#include <stdlib.h>
-#include <glib.h>
-
-#include <gtk/gtknotebook.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtkalignment.h>
+#include <gtk/gtk.h>
#include <libgnomeui/gnome-druid.h>
#include <libgnomeui/gnome-druid-page-standard.h>
Modified: trunk/e-util/e-plugin.h
==============================================================================
--- trunk/e-util/e-plugin.h (original)
+++ trunk/e-util/e-plugin.h Fri Jun 6 15:12:53 2008
@@ -2,10 +2,8 @@
#ifndef _E_PLUGIN_H
#define _E_PLUGIN_H
-#include <glib.h>
-#include <glib-object.h>
+#include <gtk/gtk.h>
#include <libxml/tree.h>
-#include <gtk/gtkwidget.h>
/* ********************************************************************** */
Modified: trunk/e-util/e-popup.c
==============================================================================
--- trunk/e-util/e-popup.c (original)
+++ trunk/e-util/e-popup.c Fri Jun 6 15:12:53 2008
@@ -27,17 +27,7 @@
#include <string.h>
#include <stdlib.h>
-#include <glib.h>
-
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkimagemenuitem.h>
-#include <gtk/gtkcheckmenuitem.h>
-#include <gtk/gtkradiomenuitem.h>
-#include <gtk/gtkseparatormenuitem.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkhbox.h>
+#include <gtk/gtk.h>
#include "e-popup.h"
Modified: trunk/e-util/e-request.c
==============================================================================
--- trunk/e-util/e-request.c (original)
+++ trunk/e-util/e-request.c Fri Jun 6 15:12:53 2008
@@ -26,12 +26,6 @@
#include "e-request.h"
-#include <gtk/gtkbox.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkstock.h>
-
/**
* e_request_string:
Modified: trunk/e-util/e-request.h
==============================================================================
--- trunk/e-util/e-request.h (original)
+++ trunk/e-util/e-request.h Fri Jun 6 15:12:53 2008
@@ -23,7 +23,7 @@
#ifndef E_REQUEST_H
#define E_REQUEST_H
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
char *e_request_string (GtkWindow *parent,
const char *title,
Modified: trunk/e-util/e-text-event-processor-types.h
==============================================================================
--- trunk/e-util/e-text-event-processor-types.h (original)
+++ trunk/e-util/e-text-event-processor-types.h Fri Jun 6 15:12:53 2008
@@ -24,12 +24,10 @@
#ifndef __E_TEXT_EVENT_PROCESSOR_TYPES_H__
#define __E_TEXT_EVENT_PROCESSOR_TYPES_H__
-#include <glib/gmacros.h>
+#include <gtk/gtk.h>
G_BEGIN_DECLS
-#include <gdk/gdkevents.h>
-
typedef union _ETextEventProcessorEvent ETextEventProcessorEvent;
typedef enum {
Modified: trunk/e-util/e-text-event-processor.h
==============================================================================
--- trunk/e-util/e-text-event-processor.h (original)
+++ trunk/e-util/e-text-event-processor.h Fri Jun 6 15:12:53 2008
@@ -24,8 +24,7 @@
#ifndef __E_TEXT_EVENT_PROCESSOR_H__
#define __E_TEXT_EVENT_PROCESSOR_H__
-#include <glib.h>
-#include <gtk/gtkobject.h>
+#include <gtk/gtk.h>
#include <e-util/e-text-event-processor-types.h>
#ifdef __cplusplus
Modified: trunk/e-util/e-util-labels.c
==============================================================================
--- trunk/e-util/e-util-labels.c (original)
+++ trunk/e-util/e-util-labels.c Fri Jun 6 15:12:53 2008
@@ -19,7 +19,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include <glib.h>
+#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <stdio.h>
@@ -27,14 +27,6 @@
#include <gconf/gconf-client.h>
-#include <gtk/gtkbox.h>
-#include <gtk/gtkcolorbutton.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtktable.h>
-
#include <camel/camel-utf8.h>
#include "e-util-labels.h"
Modified: trunk/e-util/e-util-labels.h
==============================================================================
--- trunk/e-util/e-util-labels.h (original)
+++ trunk/e-util/e-util-labels.h Fri Jun 6 15:12:53 2008
@@ -22,8 +22,7 @@
#ifndef _E_UTIL_LABELS_H
#define _E_UTIL_LABELS_H
-#include <glib.h>
-#include <gdk/gdkcolor.h>
+#include <gtk/gtk.h>
struct _GtkWindow;
struct _GConfClient;
Modified: trunk/e-util/gconf-bridge.c
==============================================================================
--- trunk/e-util/gconf-bridge.c (original)
+++ trunk/e-util/gconf-bridge.c Fri Jun 6 15:12:53 2008
@@ -21,8 +21,8 @@
#include <config.h>
+#include <gtk/gtk.h>
#include <glib/gi18n-lib.h>
-#include <gtk/gtkmessagedialog.h>
#include <string.h>
#include "gconf-bridge.h"
Modified: trunk/e-util/gconf-bridge.h
==============================================================================
--- trunk/e-util/gconf-bridge.h (original)
+++ trunk/e-util/gconf-bridge.h Fri Jun 6 15:12:53 2008
@@ -23,8 +23,7 @@
#define __GCONF_BRIDGE_H__
#include <gconf/gconf-client.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkliststore.h>
+#include <gtk/gtk.h>
G_BEGIN_DECLS
Modified: trunk/filter/filter-colour.c
==============================================================================
--- trunk/filter/filter-colour.c (original)
+++ trunk/filter/filter-colour.c Fri Jun 6 15:12:53 2008
@@ -25,8 +25,7 @@
#include <config.h>
#endif
-#include <gtk/gtksignal.h>
-#include <gtk/gtkcolorbutton.h>
+#include <gtk/gtk.h>
#include "libedataserver/e-sexp.h"
#include "filter-colour.h"
Modified: trunk/filter/filter-element.h
==============================================================================
--- trunk/filter/filter-element.h (original)
+++ trunk/filter/filter-element.h Fri Jun 6 15:12:53 2008
@@ -23,9 +23,7 @@
#ifndef _FILTER_ELEMENT_H
#define _FILTER_ELEMENT_H
-#include <glib.h>
-#include <glib-object.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
#include <libxml/parser.h>
#include <libxml/xmlmemory.h>
Modified: trunk/filter/filter-file.c
==============================================================================
--- trunk/filter/filter-file.c (original)
+++ trunk/filter/filter-file.c Fri Jun 6 15:12:53 2008
@@ -25,13 +25,9 @@
#include <string.h>
#include <sys/types.h>
-#include <glib.h>
-#include <glib/gstdio.h>
-
#include <gtk/gtk.h>
-
#include <glib/gi18n.h>
-#include <gtk/gtkfilechooserbutton.h>
+#include <glib/gstdio.h>
#include <libedataserver/e-sexp.h>
Modified: trunk/filter/filter-int.c
==============================================================================
--- trunk/filter/filter-int.c (original)
+++ trunk/filter/filter-int.c Fri Jun 6 15:12:53 2008
@@ -26,7 +26,7 @@
#endif
#include <stdlib.h>
-#include <gtk/gtkspinbutton.h>
+#include <gtk/gtk.h>
#include <libedataserver/e-sexp.h>
#include "filter-int.h"
Modified: trunk/filter/filter-part.c
==============================================================================
--- trunk/filter/filter-part.c (original)
+++ trunk/filter/filter-part.c Fri Jun 6 15:12:53 2008
@@ -28,8 +28,7 @@
#include <stdlib.h>
#include <string.h>
-#include <gtk/gtkbox.h>
-#include <gtk/gtkhbox.h>
+#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include "filter-part.h"
Modified: trunk/mail/em-account-editor.c
==============================================================================
--- trunk/mail/em-account-editor.c (original)
+++ trunk/mail/em-account-editor.c Fri Jun 6 15:12:53 2008
@@ -39,7 +39,7 @@
#include <config.h>
#endif
-#include <glib.h>
+#include <glib/gi18n.h>
#include <glib/gstdio.h>
#include <string.h>
@@ -49,22 +49,6 @@
#include <glade/glade.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtktextbuffer.h>
-#include <gtk/gtktextview.h>
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtknotebook.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkcelllayout.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkcombobox.h>
-#include <gtk/gtktable.h>
-
-#include <glib/gi18n.h>
#include <libgnomeui/gnome-druid.h>
#include <libgnomeui/gnome-druid-page-standard.h>
Modified: trunk/mail/em-account-editor.h
==============================================================================
--- trunk/mail/em-account-editor.h (original)
+++ trunk/mail/em-account-editor.h Fri Jun 6 15:12:53 2008
@@ -25,13 +25,13 @@
#ifndef EM_ACCOUNT_EDITOR_H
#define EM_ACCOUNT_EDITOR_H
+#include <gtk/gtk.h>
+
#ifdef __cplusplus
extern "C" {
#pragma }
#endif /* __cplusplus */
-#include <gtk/gtkvbox.h>
-
struct _EAccount;
typedef struct _EMAccountEditor EMAccountEditor;
Modified: trunk/mail/em-account-prefs.c
==============================================================================
--- trunk/mail/em-account-prefs.c (original)
+++ trunk/mail/em-account-prefs.c Fri Jun 6 15:12:53 2008
@@ -26,13 +26,6 @@
#include <camel/camel-url.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkcellrenderertoggle.h>
-#include <gtk/gtkcellrenderertext.h>
-
#include <glib/gi18n.h>
#include "mail-component.h"
Modified: trunk/mail/em-account-prefs.h
==============================================================================
--- trunk/mail/em-account-prefs.h (original)
+++ trunk/mail/em-account-prefs.h Fri Jun 6 15:12:53 2008
@@ -24,16 +24,8 @@
#ifndef __EM_ACCOUNT_PREFS_H__
#define __EM_ACCOUNT_PREFS_H__
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkclist.h>
+#include <gtk/gtk.h>
#include <glade/glade.h>
-#include <gtk/gtktreeview.h>
#include <table/e-table.h>
@@ -41,6 +33,11 @@
#include <shell/Evolution.h>
+#ifdef __cplusplus
+extern "C" {
+#pragma }
+#endif /* __cplusplus */
+
#define EM_ACCOUNT_PREFS_TYPE (em_account_prefs_get_type ())
#define EM_ACCOUNT_PREFS(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EM_ACCOUNT_PREFS_TYPE, EMAccountPrefs))
Modified: trunk/mail/em-composer-utils.c
==============================================================================
--- trunk/mail/em-composer-utils.c (original)
+++ trunk/mail/em-composer-utils.c Fri Jun 6 15:12:53 2008
@@ -25,7 +25,7 @@
#endif
#include <string.h>
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
#include <libedataserver/e-data-server-util.h>
#include <e-util/e-util.h>
Modified: trunk/mail/em-config.c
==============================================================================
--- trunk/mail/em-config.c (original)
+++ trunk/mail/em-config.c Fri Jun 6 15:12:53 2008
@@ -27,16 +27,7 @@
#include <string.h>
#include <stdlib.h>
-#include <glib.h>
-
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkimagemenuitem.h>
-#include <gtk/gtkcheckmenuitem.h>
-#include <gtk/gtkradiomenuitem.h>
-#include <gtk/gtkseparatormenuitem.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkimage.h>
+#include <gtk/gtk.h>
#include <libgnome/gnome-url.h>
Modified: trunk/mail/em-folder-browser.c
==============================================================================
--- trunk/mail/em-folder-browser.c (original)
+++ trunk/mail/em-folder-browser.c Fri Jun 6 15:12:53 2008
@@ -31,12 +31,7 @@
#include <string.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkvpaned.h>
-#include <gtk/gtkhpaned.h>
-#include <gtkhtml/gtkhtml.h>
+#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
#include <gconf/gconf-client.h>
@@ -100,6 +95,8 @@
#include "evolution-shell-component-utils.h" /* Pixmap stuff, sigh */
+#include <gtkhtml/gtkhtml.h>
+
extern CamelSession *session;
CamelStore *vfolder_store; /* the 1 static vfolder store */
Modified: trunk/mail/em-folder-properties.c
==============================================================================
--- trunk/mail/em-folder-properties.c (original)
+++ trunk/mail/em-folder-properties.c Fri Jun 6 15:12:53 2008
@@ -25,19 +25,7 @@
#include <string.h>
-#include <gtk/gtkbox.h>
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmisc.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
#include <gconf/gconf-client.h>
Modified: trunk/mail/em-folder-selection-button.c
==============================================================================
--- trunk/mail/em-folder-selection-button.c (original)
+++ trunk/mail/em-folder-selection-button.c Fri Jun 6 15:12:53 2008
@@ -26,10 +26,6 @@
#include <string.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkhbox.h>
-
#include <e-util/e-util.h>
#include <glib/gi18n.h>
Modified: trunk/mail/em-folder-selection-button.h
==============================================================================
--- trunk/mail/em-folder-selection-button.h (original)
+++ trunk/mail/em-folder-selection-button.h Fri Jun 6 15:12:53 2008
@@ -24,7 +24,7 @@
#ifndef __EM_FOLDER_SELECTION_BUTTON_H__
#define __EM_FOLDER_SELECTION_BUTTON_H__
-#include <gtk/gtkbutton.h>
+#include <gtk/gtk.h>
#ifdef __cplusplus
extern "C" {
Modified: trunk/mail/em-folder-selection.c
==============================================================================
--- trunk/mail/em-folder-selection.c (original)
+++ trunk/mail/em-folder-selection.c Fri Jun 6 15:12:53 2008
@@ -26,8 +26,7 @@
#include <string.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkstock.h>
+#include <gtk/gtk.h>
#include "em-folder-tree.h"
#include "em-folder-selector.h"
Modified: trunk/mail/em-folder-selector.c
==============================================================================
--- trunk/mail/em-folder-selector.c (original)
+++ trunk/mail/em-folder-selector.c Fri Jun 6 15:12:53 2008
@@ -32,14 +32,6 @@
#include <e-util/e-util.h>
#include <misc/e-gui-utils.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkstock.h>
-
#include <camel/camel-url.h>
#include <camel/camel-store.h>
#include <camel/camel-session.h>
Modified: trunk/mail/em-folder-selector.h
==============================================================================
--- trunk/mail/em-folder-selector.h (original)
+++ trunk/mail/em-folder-selector.h Fri Jun 6 15:12:53 2008
@@ -23,7 +23,7 @@
#ifndef EM_FOLDER_SELECTOR_H
#define EM_FOLDER_SELECTOR_H
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
#ifdef cplusplus
extern "C" {
Modified: trunk/mail/em-folder-tree-model.h
==============================================================================
--- trunk/mail/em-folder-tree-model.h (original)
+++ trunk/mail/em-folder-tree-model.h Fri Jun 6 15:12:53 2008
@@ -24,8 +24,7 @@
#ifndef __EM_FOLDER_TREE_MODEL_H__
#define __EM_FOLDER_TREE_MODEL_H__
-#include <gtk/gtktreednd.h>
-#include <gtk/gtktreestore.h>
+#include <gtk/gtk.h>
#include <libxml/tree.h>
Modified: trunk/mail/em-folder-tree.c
==============================================================================
--- trunk/mail/em-folder-tree.c (original)
+++ trunk/mail/em-folder-tree.c Fri Jun 6 15:12:53 2008
@@ -36,8 +36,6 @@
#include <libxml/tree.h>
#include <glib/gi18n.h>
-#include <gtk/gtk.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gdk/gdkkeysyms.h>
#include <glib/gi18n.h>
Modified: trunk/mail/em-folder-tree.h
==============================================================================
--- trunk/mail/em-folder-tree.h (original)
+++ trunk/mail/em-folder-tree.h Fri Jun 6 15:12:53 2008
@@ -24,7 +24,7 @@
#ifndef __EM_FOLDER_TREE_H__
#define __EM_FOLDER_TREE_H__
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
#include <camel/camel-store.h>
#include "mail/em-folder-tree-model.h"
Modified: trunk/mail/em-folder-view.c
==============================================================================
--- trunk/mail/em-folder-view.c (original)
+++ trunk/mail/em-folder-view.c Fri Jun 6 15:12:53 2008
@@ -27,12 +27,9 @@
#include <sys/stat.h>
#include <unistd.h>
-#include <glib.h>
#include <glib/gstdio.h>
-#include <libgnome/gnome-util.h>
-
-#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
+#include <libgnome/gnome-util.h>
#ifdef G_OS_WIN32
/* Work around 'DATADIR' and 'interface' lossage in <windows.h> */
Modified: trunk/mail/em-folder-view.h
==============================================================================
--- trunk/mail/em-folder-view.h (original)
+++ trunk/mail/em-folder-view.h Fri Jun 6 15:12:53 2008
@@ -23,8 +23,7 @@
#ifndef EM_FOLDER_VIEW_H
#define EM_FOLDER_VIEW_H
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkprintoperation.h>
+#include <gtk/gtk.h>
#include "mail/em-popup.h"
/* Standard GObject macros */
Modified: trunk/mail/em-format-html-display.c
==============================================================================
--- trunk/mail/em-format-html-display.c (original)
+++ trunk/mail/em-format-html-display.c Fri Jun 6 15:12:53 2008
@@ -26,7 +26,7 @@
#include <string.h>
-#include <glib.h>
+#include <gtk/gtk.h>
#include <glib/gstdio.h>
#include <gdk/gdkkeysyms.h>
@@ -42,28 +42,6 @@
#include <gtkhtml/gtkhtml-embedded.h>
#include <gtkhtml/gtkhtml-search.h>
-#include <gtk/gtkeventbox.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkarrow.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtktextview.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkdnd.h>
-#include <gtk/gtktoolbutton.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtksignal.h>
-
#include <glade/glade.h>
#include <glib/gi18n.h>
Modified: trunk/mail/em-format-html.c
==============================================================================
--- trunk/mail/em-format-html.c (original)
+++ trunk/mail/em-format-html.c Fri Jun 6 15:12:53 2008
@@ -1491,6 +1491,7 @@
{
const char *fmt, *html;
char *mhtml = NULL;
+ gboolean is_rtl;
if (value == NULL)
return;
@@ -1503,7 +1504,7 @@
else
html = value;
- gboolean is_rtl = gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL;
+ is_rtl = gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL;
if (emfh->simple_headers) {
fmt = "<b>%s</b>: %s<br>";
} else {
Modified: trunk/mail/em-html-stream.c
==============================================================================
--- trunk/mail/em-html-stream.c (original)
+++ trunk/mail/em-html-stream.c Fri Jun 6 15:12:53 2008
@@ -28,7 +28,7 @@
#include <stdio.h>
#include <gtkhtml/gtkhtml.h>
#include <gtkhtml/gtkhtml-stream.h>
-#include <gtk/gtkmain.h>
+#include <gtk/gtk.h>
#include "em-html-stream.h"
#define d(x)
Modified: trunk/mail/em-icon-stream.c
==============================================================================
--- trunk/mail/em-icon-stream.c (original)
+++ trunk/mail/em-icon-stream.c Fri Jun 6 15:12:53 2008
@@ -30,7 +30,7 @@
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gdk-pixbuf/gdk-pixbuf-loader.h>
-#include <gtk/gtkimage.h>
+#include <gtk/gtk.h>
#include "em-icon-stream.h"
#include "e-util/e-icon-factory.h"
Modified: trunk/mail/em-mailer-prefs.c
==============================================================================
--- trunk/mail/em-mailer-prefs.c (original)
+++ trunk/mail/em-mailer-prefs.c Fri Jun 6 15:12:53 2008
@@ -35,25 +35,10 @@
#include "misc/e-charset-picker.h"
#include <bonobo/bonobo-generic-factory.h>
-#include <gtk/gtkcolorbutton.h>
-#include <gtk/gtkfilechooserbutton.h>
-#include <gtk/gtkfontbutton.h>
-
#include <glade/glade.h>
#include <gconf/gconf-client.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtkcellrenderertoggle.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkoptionmenu.h>
-#include <gtk/gtkmenuitem.h>
-
#include "libedataserverui/e-cell-renderer-color.h"
#include "e-util/e-util-private.h"
Modified: trunk/mail/em-mailer-prefs.h
==============================================================================
--- trunk/mail/em-mailer-prefs.h (original)
+++ trunk/mail/em-mailer-prefs.h Fri Jun 6 15:12:53 2008
@@ -28,7 +28,7 @@
#pragma }
#endif /* __cplusplus */
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
#include <shell/Evolution.h>
struct _ESignature;
Modified: trunk/mail/em-menu.c
==============================================================================
--- trunk/mail/em-menu.c (original)
+++ trunk/mail/em-menu.c Fri Jun 6 15:12:53 2008
@@ -27,16 +27,7 @@
#include <string.h>
#include <stdlib.h>
-#include <glib.h>
-
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkimagemenuitem.h>
-#include <gtk/gtkcheckmenuitem.h>
-#include <gtk/gtkradiomenuitem.h>
-#include <gtk/gtkseparatormenuitem.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkimage.h>
+#include <gtk/gtk.h>
#include <libgnome/gnome-url.h>
Modified: trunk/mail/em-message-browser.c
==============================================================================
--- trunk/mail/em-message-browser.c (original)
+++ trunk/mail/em-message-browser.c Fri Jun 6 15:12:53 2008
@@ -33,7 +33,6 @@
#undef interface
#endif
-#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
#include <gconf/gconf-client.h>
Modified: trunk/mail/em-message-browser.h
==============================================================================
--- trunk/mail/em-message-browser.h (original)
+++ trunk/mail/em-message-browser.h Fri Jun 6 15:12:53 2008
@@ -2,7 +2,7 @@
#ifndef EM_MESSAGE_BROWSER_H
#define EM_MESSAGE_BROWSER_H
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
#include "em-folder-view.h"
/* Standard GObject macros */
Modified: trunk/mail/em-network-prefs.c
==============================================================================
--- trunk/mail/em-network-prefs.c (original)
+++ trunk/mail/em-network-prefs.c Fri Jun 6 15:12:53 2008
@@ -38,13 +38,6 @@
#include <gconf/gconf-client.h>
#include <glade/glade.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtklabel.h>
-
-#include <gtk/gtkfilechooserbutton.h>
#include <glib/gstdio.h>
#include "e-util/e-error.h"
Modified: trunk/mail/em-network-prefs.h
==============================================================================
--- trunk/mail/em-network-prefs.h (original)
+++ trunk/mail/em-network-prefs.h Fri Jun 6 15:12:53 2008
@@ -29,8 +29,7 @@
#pragma }
#endif /* __cplusplus */
-#include <glib.h>
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
#define EM_NETWORK_PREFS_TYPE (em_network_prefs_get_type ())
#define EM_NETWORK_PREFS(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EM_NETWORK_PREFS_TYPE, EMNetworkPrefs))
Modified: trunk/mail/em-popup.c
==============================================================================
--- trunk/mail/em-popup.c (original)
+++ trunk/mail/em-popup.c Fri Jun 6 15:12:53 2008
@@ -27,20 +27,9 @@
#include <string.h>
#include <stdlib.h>
-#include <glib.h>
+#include <gtk/gtk.h>
#include <glib/gi18n.h>
-#include <gio/gio.h>
-
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkimagemenuitem.h>
-#include <gtk/gtkcheckmenuitem.h>
-#include <gtk/gtkradiomenuitem.h>
-#include <gtk/gtkseparatormenuitem.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkimage.h>
-
#include <libgnome/gnome-url.h>
#include "em-popup.h"
Modified: trunk/mail/em-subscribe-editor.c
==============================================================================
--- trunk/mail/em-subscribe-editor.c (original)
+++ trunk/mail/em-subscribe-editor.c Fri Jun 6 15:12:53 2008
@@ -47,19 +47,6 @@
#include <glade/glade.h>
#include <glib/gi18n.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtktreestore.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtkcellrenderertoggle.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkoptionmenu.h>
-#include <gtk/gtkprogressbar.h>
-#include <gtk/gtkmenuitem.h>
-
#define d(x)
typedef struct _EMSubscribeEditor EMSubscribeEditor;
Modified: trunk/mail/em-subscribe-editor.h
==============================================================================
--- trunk/mail/em-subscribe-editor.h (original)
+++ trunk/mail/em-subscribe-editor.h Fri Jun 6 15:12:53 2008
@@ -2,7 +2,7 @@
#ifndef _EM_SUBSCRIBE_EDITOR_H
#define _EM_SUBSCRIBE_EDITOR_H
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
GtkDialog *em_subscribe_editor_new(void);
Modified: trunk/mail/importers/elm-importer.c
==============================================================================
--- trunk/mail/importers/elm-importer.c (original)
+++ trunk/mail/importers/elm-importer.c Fri Jun 6 15:12:53 2008
@@ -33,10 +33,8 @@
#include <dirent.h>
#include <string.h>
-#include <glib.h>
+#include <gtk/gtk.h>
#include <glib/gi18n.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkcheckbutton.h>
#include <gconf/gconf-client.h>
Modified: trunk/mail/importers/evolution-mbox-importer.c
==============================================================================
--- trunk/mail/importers/evolution-mbox-importer.c (original)
+++ trunk/mail/importers/evolution-mbox-importer.c Fri Jun 6 15:12:53 2008
@@ -35,10 +35,7 @@
#include <ctype.h>
#include <string.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtklabel.h>
-
+#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <glib/gstdio.h>
Modified: trunk/mail/importers/pine-importer.c
==============================================================================
--- trunk/mail/importers/pine-importer.c (original)
+++ trunk/mail/importers/pine-importer.c Fri Jun 6 15:12:53 2008
@@ -35,10 +35,8 @@
#include <dirent.h>
#include <string.h>
-#include <glib.h>
+#include <gtk/gtk.h>
#include <glib/gi18n.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkcheckbutton.h>
#include <gconf/gconf-client.h>
Modified: trunk/mail/mail-component.c
==============================================================================
--- trunk/mail/mail-component.c (original)
+++ trunk/mail/mail-component.c Fri Jun 6 15:12:53 2008
@@ -74,7 +74,7 @@
#include "e-task-bar.h"
-#include <gtk/gtklabel.h>
+#include <gtk/gtk.h>
#include <e-util/e-mktemp.h>
#include <Evolution.h>
Modified: trunk/mail/mail-config.c
==============================================================================
--- trunk/mail/mail-config.c (original)
+++ trunk/mail/mail-config.c Fri Jun 6 15:12:53 2008
@@ -35,14 +35,13 @@
#include <string.h>
#include <ctype.h>
-#include <glib.h>
+#include <gtk/gtk.h>
#include <glib/gstdio.h>
#ifndef G_OS_WIN32
#include <sys/wait.h>
#endif
-#include <gtk/gtkdialog.h>
#include <gtkhtml/gtkhtml.h>
#include <glade/glade.h>
@@ -256,9 +255,11 @@
if (!config->jh_check) {
mail_session_set_junk_headers (NULL, NULL, 0);
} else {
- config->jh_header = gconf_client_get_list (config->gconf, "/apps/evolution/mail/junk/custom_header", GCONF_VALUE_STRING, NULL);
- GSList *node = config->jh_header;
+ GSList *node;
GPtrArray *name, *value;
+
+ config->jh_header = gconf_client_get_list (config->gconf, "/apps/evolution/mail/junk/custom_header", GCONF_VALUE_STRING, NULL);
+ node = config->jh_header;
name = g_ptr_array_new ();
value = g_ptr_array_new ();
while (node && node->data) {
@@ -278,9 +279,11 @@
gconf_jh_headers_changed (GConfClient *client, guint cnxn_id,
GConfEntry *entry, gpointer user_data)
{
- config->jh_header = gconf_client_get_list (config->gconf, "/apps/evolution/mail/junk/custom_header", GCONF_VALUE_STRING, NULL);
- GSList *node = config->jh_header;
+ GSList *node;
GPtrArray *name, *value;
+
+ config->jh_header = gconf_client_get_list (config->gconf, "/apps/evolution/mail/junk/custom_header", GCONF_VALUE_STRING, NULL);
+ node = config->jh_header;
name = g_ptr_array_new ();
value = g_ptr_array_new ();
while (node && node->data) {
Modified: trunk/mail/mail-send-recv.c
==============================================================================
--- trunk/mail/mail-send-recv.c (original)
+++ trunk/mail/mail-send-recv.c Fri Jun 6 15:12:53 2008
@@ -27,19 +27,7 @@
#include <stdio.h>
#include <string.h>
-/* for the dialog stuff */
-#include <glib.h>
#include <glib/gi18n.h>
-#include <gtk/gtkbox.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkprogressbar.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtktable.h>
#include "libedataserver/e-account-list.h"
Modified: trunk/mail/mail-send-recv.h
==============================================================================
--- trunk/mail/mail-send-recv.h (original)
+++ trunk/mail/mail-send-recv.h Fri Jun 6 15:12:53 2008
@@ -23,13 +23,14 @@
#ifndef MAIL_SEND_RECV_H
#define MAIL_SEND_RECV_H
+#include <gtk/gtk.h>
+#include "mail-config.h"
+
#ifdef __cplusplus
extern "C" {
#pragma }
#endif /* __cplusplus */
-#include "mail-config.h"
-
/* send/receive all uri's */
GtkWidget *mail_send_receive(void);
/* receive a single uri */
Modified: trunk/mail/message-list.c
==============================================================================
--- trunk/mail/message-list.c (original)
+++ trunk/mail/message-list.c Fri Jun 6 15:12:53 2008
@@ -31,15 +31,11 @@
#include <string.h>
#include <ctype.h>
-#include <glib.h>
+#include <glib/gi18n.h>
#include <glib/gstdio.h>
#include <gconf/gconf-client.h>
-#include <gtk/gtk.h>
-
-#include <glib/gi18n.h>
-
#include <camel/camel-exception.h>
#include <camel/camel-file-utils.h>
#include <camel/camel-folder.h>
Modified: trunk/mail/message-list.h
==============================================================================
--- trunk/mail/message-list.h (original)
+++ trunk/mail/message-list.h Fri Jun 6 15:12:53 2008
@@ -24,8 +24,7 @@
#ifndef _MESSAGE_LIST_H_
#define _MESSAGE_LIST_H_
-#include <gtk/gtkobject.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
#include <table/e-table-simple.h>
#include <table/e-tree-scrolled.h>
Modified: trunk/mail/message-tag-editor.c
==============================================================================
--- trunk/mail/message-tag-editor.c (original)
+++ trunk/mail/message-tag-editor.c Fri Jun 6 15:12:53 2008
@@ -25,8 +25,6 @@
#include <config.h>
#endif
-#include <gtk/gtkstock.h>
-
#include "message-tag-editor.h"
static void message_tag_editor_class_init (MessageTagEditorClass *class);
Modified: trunk/mail/message-tag-editor.h
==============================================================================
--- trunk/mail/message-tag-editor.h (original)
+++ trunk/mail/message-tag-editor.h Fri Jun 6 15:12:53 2008
@@ -24,8 +24,7 @@
#ifndef __MESSAGE_TAG_EDITOR_H__
#define __MESSAGE_TAG_EDITOR_H__
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
#include <camel/camel-folder.h>
#include <camel/camel-folder-summary.h>
Modified: trunk/mail/message-tag-followup.c
==============================================================================
--- trunk/mail/message-tag-followup.c (original)
+++ trunk/mail/message-tag-followup.c Fri Jun 6 15:12:53 2008
@@ -26,16 +26,7 @@
#include <stdlib.h>
#include <string.h>
-#include <gtk/gtkcombo.h>
-#include <gtk/gtklist.h>
-
-#include <gtk/gtkentry.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkbox.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkcellrenderertext.h>
-
+#include <gtk/gtk.h>
#include <glade/glade.h>
#include <gconf/gconf.h>
Modified: trunk/plugins/audio-inline/audio-inline.c
==============================================================================
--- trunk/plugins/audio-inline/audio-inline.c (original)
+++ trunk/plugins/audio-inline/audio-inline.c Fri Jun 6 15:12:53 2008
@@ -10,6 +10,8 @@
#include "config.h"
#endif
+#include <gtk/gtk.h>
+#include <glib/gstdio.h>
#include "e-util/e-icon-factory.h"
#include "e-util/e-mktemp.h"
#include "camel/camel-medium.h"
@@ -18,11 +20,6 @@
#include "camel/camel-stream-fs.h"
#include "mail/em-format-hook.h"
#include "mail/em-format-html.h"
-#include "glib/gstdio.h"
-#include "gtk/gtkbutton.h"
-#include "gtk/gtkbox.h"
-#include "gtk/gtkimage.h"
-#include "gtk/gtkhbbox.h"
#include "gtkhtml/gtkhtml-embedded.h"
#include "gst/gst.h"
Modified: trunk/plugins/calendar-file/calendar-file.c
==============================================================================
--- trunk/plugins/calendar-file/calendar-file.c (original)
+++ trunk/plugins/calendar-file/calendar-file.c Fri Jun 6 15:12:53 2008
@@ -19,14 +19,7 @@
*
*/
-#include <gtk/gtklabel.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtkoptionmenu.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkhbox.h>
+#include <gtk/gtk.h>
#include <e-util/e-config.h>
#include <calendar/gui/e-cal-config.h>
#include <libedataserver/e-source.h>
Modified: trunk/plugins/calendar-http/calendar-http.c
==============================================================================
--- trunk/plugins/calendar-http/calendar-http.c (original)
+++ trunk/plugins/calendar-http/calendar-http.c Fri Jun 6 15:12:53 2008
@@ -19,16 +19,7 @@
*
*/
-#include <glib-object.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtkoptionmenu.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkcheckbutton.h>
+#include <gtk/gtk.h>
#include <e-util/e-config.h>
#include <calendar/gui/e-cal-config.h>
#include <libedataserver/e-source.h>
Modified: trunk/plugins/copy-tool/copy-tool.c
==============================================================================
--- trunk/plugins/copy-tool/copy-tool.c (original)
+++ trunk/plugins/copy-tool/copy-tool.c Fri Jun 6 15:12:53 2008
@@ -16,7 +16,7 @@
#include "mail/em-popup.h"
-#include <gtk/gtkclipboard.h>
+#include <gtk/gtk.h>
#include "camel/camel-internet-address.h"
#include "camel/camel-url.h"
Modified: trunk/plugins/email-custom-header/email-custom-header.c
==============================================================================
--- trunk/plugins/email-custom-header/email-custom-header.c (original)
+++ trunk/plugins/email-custom-header/email-custom-header.c Fri Jun 6 15:12:53 2008
@@ -23,10 +23,6 @@
#endif
#include <string.h>
-#include <glib.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkcombobox.h>
-#include <gtk/gtktable.h>
#include <glib/gi18n.h>
#include <gconf/gconf-client.h>
#include <e-util/e-error.h>
@@ -268,10 +264,12 @@
header_list = gconf_client_get_list (client,path,GCONF_VALUE_STRING, NULL);
for (q = header_list,pos = 0; q != NULL; q = q->next,pos++) {
+ gchar **parse_header_list;
+
memset(&temp_header_value_details,0,sizeof(CustomSubHeader));
temp_header_details.sub_header_type_value = g_array_new (TRUE, TRUE, sizeof (CustomSubHeader));
buffer = q->data;
- gchar **parse_header_list = g_strsplit_set (buffer, "=;,", -1);
+ parse_header_list = g_strsplit_set (buffer, "=;,", -1);
str_colon = g_strconcat (parse_header_list[0], ":", NULL);
temp_header_details.header_type_value = g_string_new("");
if (temp_header_details.header_type_value) {
Modified: trunk/plugins/email-custom-header/email-custom-header.h
==============================================================================
--- trunk/plugins/email-custom-header/email-custom-header.h (original)
+++ trunk/plugins/email-custom-header/email-custom-header.h Fri Jun 6 15:12:53 2008
@@ -20,7 +20,7 @@
#ifndef __EMAIL_CUSTOM_HEADEROPTIONS_DIALOG_H__
#define __EMAIL_CUSTOM_HEADEROPTIONS_DIALOG_H__
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
#define EMAIL_CUSTOM_HEADER_OPTIONS_DIALOG (epech_dialog_get_type ())
#define EMAIL_CUSTOM_HEADEROPTIONS_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EMAIL_CUSTOM_HEADER_OPTIONS_DIALOG, CustomHeaderOptionsDialog))
Modified: trunk/plugins/exchange-operations/exchange-account-setup.c
==============================================================================
--- trunk/plugins/exchange-operations/exchange-account-setup.c (original)
+++ trunk/plugins/exchange-operations/exchange-account-setup.c Fri Jun 6 15:12:53 2008
@@ -28,10 +28,9 @@
#include <string.h>
#include <unistd.h>
#include <sys/stat.h>
+#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <glade/glade.h>
-#include <gtk/gtk.h>
-#include <gtk/gtkdialog.h>
#include <gconf/gconf-client.h>
#include <camel/camel-provider.h>
#include <camel/camel-url.h>
Modified: trunk/plugins/exchange-operations/exchange-change-password.c
==============================================================================
--- trunk/plugins/exchange-operations/exchange-change-password.c (original)
+++ trunk/plugins/exchange-operations/exchange-change-password.c Fri Jun 6 15:12:53 2008
@@ -29,9 +29,7 @@
#include <e2k-utils.h>
#include <glade/glade-xml.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtklabel.h>
+#include <gtk/gtk.h>
#define FILENAME EVOLUTION_GLADEDIR "/exchange-change-password.glade"
#define ROOTNODE "pass_dialog"
Modified: trunk/plugins/exchange-operations/exchange-delegates-user.c
==============================================================================
--- trunk/plugins/exchange-operations/exchange-delegates-user.c (original)
+++ trunk/plugins/exchange-operations/exchange-delegates-user.c Fri Jun 6 15:12:53 2008
@@ -43,17 +43,6 @@
#include <e-util/e-dialog-utils.h>
#include <e-util/e-dialog-widgets.h>
#include <glade/glade.h>
-#include <gtk/gtkbox.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkmenushell.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtktogglebutton.h>
-
-#include <gtk/gtkoptionmenu.h>
-
-#include <glib.h>
#include <string.h>
Modified: trunk/plugins/exchange-operations/exchange-delegates-user.h
==============================================================================
--- trunk/plugins/exchange-operations/exchange-delegates-user.h (original)
+++ trunk/plugins/exchange-operations/exchange-delegates-user.h Fri Jun 6 15:12:53 2008
@@ -6,7 +6,7 @@
#include <exchange-types.h>
#include <e2k-security-descriptor.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
#ifdef __cplusplus
extern "C" {
Modified: trunk/plugins/exchange-operations/exchange-delegates.c
==============================================================================
--- trunk/plugins/exchange-operations/exchange-delegates.c (original)
+++ trunk/plugins/exchange-operations/exchange-delegates.c Fri Jun 6 15:12:53 2008
@@ -43,12 +43,6 @@
#include <e-util/e-dialog-utils.h>
#include <e-util/e-error.h>
#include <glade/glade-xml.h>
-#include <gtk/gtkbox.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkmessagedialog.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtktreeview.h>
typedef struct {
const char *uri;
Modified: trunk/plugins/exchange-operations/exchange-delegates.h
==============================================================================
--- trunk/plugins/exchange-operations/exchange-delegates.h (original)
+++ trunk/plugins/exchange-operations/exchange-delegates.h Fri Jun 6 15:12:53 2008
@@ -5,7 +5,7 @@
#define __EXCHANGE_DELEGATES_H__
#include <exchange-types.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
#ifdef __cplusplus
extern "C" {
Modified: trunk/plugins/exchange-operations/exchange-folder-permission.c
==============================================================================
--- trunk/plugins/exchange-operations/exchange-folder-permission.c (original)
+++ trunk/plugins/exchange-operations/exchange-folder-permission.c Fri Jun 6 15:12:53 2008
@@ -25,7 +25,6 @@
#include <glib/gi18n.h>
#include <glade/glade.h>
#include <gtk/gtk.h>
-#include <gtk/gtkdialog.h>
#include <gconf/gconf-client.h>
#include <exchange-account.h>
#include <e-util/e-dialog-utils.h>
Modified: trunk/plugins/exchange-operations/exchange-folder-size-display.c
==============================================================================
--- trunk/plugins/exchange-operations/exchange-folder-size-display.c (original)
+++ trunk/plugins/exchange-operations/exchange-folder-size-display.c Fri Jun 6 15:12:53 2008
@@ -28,11 +28,6 @@
#include <glib/gi18n.h>
#include <e-util/e-dialog-utils.h>
#include <glade/glade-xml.h>
-#include <gtk/gtkbox.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkmessagedialog.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtktreeview.h>
#include "exchange-folder-size-display.h"
enum {
Modified: trunk/plugins/exchange-operations/exchange-folder-size-display.h
==============================================================================
--- trunk/plugins/exchange-operations/exchange-folder-size-display.h (original)
+++ trunk/plugins/exchange-operations/exchange-folder-size-display.h Fri Jun 6 15:12:53 2008
@@ -4,8 +4,7 @@
#ifndef __EXCHANGE_FOLDER_SIZE_DISPLAY_H__
#define __EXCHANGE_FOLDER_SIZE_DISPLAY_H__
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkliststore.h>
+#include <gtk/gtk.h>
#ifdef __cplusplus
extern "C" {
Modified: trunk/plugins/exchange-operations/exchange-folder.c
==============================================================================
--- trunk/plugins/exchange-operations/exchange-folder.c (original)
+++ trunk/plugins/exchange-operations/exchange-folder.c Fri Jun 6 15:12:53 2008
@@ -25,7 +25,6 @@
#include <glib/gi18n.h>
#include <gtk/gtk.h>
-#include <gtk/gtkdialog.h>
#include <gconf/gconf-client.h>
#include <e-folder-exchange.h>
#include <exchange-hierarchy.h>
Modified: trunk/plugins/exchange-operations/exchange-permissions-dialog.c
==============================================================================
--- trunk/plugins/exchange-operations/exchange-permissions-dialog.c (original)
+++ trunk/plugins/exchange-operations/exchange-permissions-dialog.c Fri Jun 6 15:12:53 2008
@@ -40,16 +40,6 @@
#include <e-util/e-dialog-utils.h>
#include <e-util/e-error.h>
#include <glade/glade-xml.h>
-#include <gtk/gtkbox.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkmenushell.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtk.h>
struct _ExchangePermissionsDialogPrivate {
ExchangeAccount *account;
Modified: trunk/plugins/exchange-operations/exchange-permissions-dialog.h
==============================================================================
--- trunk/plugins/exchange-operations/exchange-permissions-dialog.h (original)
+++ trunk/plugins/exchange-operations/exchange-permissions-dialog.h Fri Jun 6 15:12:53 2008
@@ -4,7 +4,7 @@
#ifndef __EXCHANGE_PERMISSIONS_DIALOG_H__
#define __EXCHANGE_PERMISSIONS_DIALOG_H__
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
#include "e-folder.h"
#include "exchange-types.h"
Modified: trunk/plugins/exchange-operations/exchange-send-options.c
==============================================================================
--- trunk/plugins/exchange-operations/exchange-send-options.c (original)
+++ trunk/plugins/exchange-operations/exchange-send-options.c Fri Jun 6 15:12:53 2008
@@ -23,14 +23,10 @@
#endif
#include <string.h>
-#include <glib.h>
#include <libedataserverui/e-name-selector.h>
#include <libedataserverui/e-contact-store.h>
#include "exchange-operations.h"
#include <e-util/e-error.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtk.h>
#include <libgnome/libgnome.h>
#include <libgnome/gnome-i18n.h>
#include <glade/glade.h>
Modified: trunk/plugins/exchange-operations/exchange-send-options.h
==============================================================================
--- trunk/plugins/exchange-operations/exchange-send-options.h (original)
+++ trunk/plugins/exchange-operations/exchange-send-options.h Fri Jun 6 15:12:53 2008
@@ -20,7 +20,6 @@
#ifndef __EXCHANGE_SENDOPTIONS_DIALOG_H__
#define __EXCHANGE_SENDOPTIONS_DIALOG_H__
-#include <gtk/gtkwidget.h>
#include <gtk/gtk.h>
Modified: trunk/plugins/exchange-operations/exchange-user-dialog.c
==============================================================================
--- trunk/plugins/exchange-operations/exchange-user-dialog.c (original)
+++ trunk/plugins/exchange-operations/exchange-user-dialog.c Fri Jun 6 15:12:53 2008
@@ -28,11 +28,6 @@
#include <bonobo/bonobo-exception.h>
#include <bonobo/bonobo-widget.h>
#include <e-util/e-dialog-utils.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkvbox.h>
#include <libedataserverui/e-name-selector.h>
#include "e2k-xml-utils.h"
Modified: trunk/plugins/exchange-operations/exchange-user-dialog.h
==============================================================================
--- trunk/plugins/exchange-operations/exchange-user-dialog.h (original)
+++ trunk/plugins/exchange-operations/exchange-user-dialog.h Fri Jun 6 15:12:53 2008
@@ -4,7 +4,7 @@
#ifndef __E2K_USER_DIALOG_H__
#define __E2K_USER_DIALOG_H__
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
#define E2K_TYPE_USER_DIALOG (e2k_user_dialog_get_type ())
#define E2K_USER_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E2K_TYPE_USER_DIALOG, E2kUserDialog))
Modified: trunk/plugins/external-editor/external-editor.c
==============================================================================
--- trunk/plugins/external-editor/external-editor.c (original)
+++ trunk/plugins/external-editor/external-editor.c Fri Jun 6 15:12:53 2008
@@ -201,8 +201,6 @@
void org_gnome_external_editor (EPlugin *ep, EMMenuTargetSelect *select)
{
- d(printf ("\n\nexternal_editor plugin is launched \n\n"));
-
/* The template to be used in the external editor */
/* README: I have not marked this for translation.
@@ -212,6 +210,11 @@
gint fd;
char *filename = NULL;
+ char *editor = NULL;
+ GConfClient *gconf;
+ GArray *array;
+
+ d(printf ("\n\nexternal_editor plugin is launched \n\n"));
fd = g_file_open_tmp (NULL, &filename, NULL);
if (fd > 0) {
@@ -225,9 +228,6 @@
return ;
}
- char *editor = NULL;
- GConfClient *gconf;
-
gconf = gconf_client_get_default ();
editor = gconf_client_get_string (gconf, EDITOR_GCONF_KEY, NULL);
if (!editor) {
@@ -240,7 +240,6 @@
}
g_object_unref (gconf);
- GArray *array;
array = g_array_sized_new (TRUE, TRUE, sizeof (gpointer), 2 * sizeof(gpointer));
array = g_array_append_val (array, editor);
array = g_array_append_val (array, filename);
Modified: trunk/plugins/google-account-setup/google-source.c
==============================================================================
--- trunk/plugins/google-account-setup/google-source.c (original)
+++ trunk/plugins/google-account-setup/google-source.c Fri Jun 6 15:12:53 2008
@@ -304,6 +304,7 @@
GtkWidget *widget;
GtkWidget *luser;
GtkWidget *user;
+ GtkWidget *label;
char *uri;
char *username;
const char *ssl_prop;
@@ -372,7 +373,7 @@
gtk_label_set_mnemonic_widget (GTK_LABEL (luser), user);
- GtkWidget *label = gtk_label_new_with_mnemonic (_("Re_fresh:"));
+ label = gtk_label_new_with_mnemonic (_("Re_fresh:"));
gtk_widget_show (label);
gtk_misc_set_alignment (GTK_MISC(label), 0.0, 0.5);
gtk_table_attach (GTK_TABLE (parent),
Modified: trunk/plugins/groupwise-features/addressbook-groupwise.c
==============================================================================
--- trunk/plugins/groupwise-features/addressbook-groupwise.c (original)
+++ trunk/plugins/groupwise-features/addressbook-groupwise.c Fri Jun 6 15:12:53 2008
@@ -18,14 +18,7 @@
*
*/
-#include <gtk/gtklabel.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtkoptionmenu.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkhbox.h>
+#include <gtk/gtk.h>
#include <e-util/e-config.h>
#include <addressbook/gui/widgets/eab-config.h>
#include <libedataserver/e-source.h>
Modified: trunk/plugins/groupwise-features/junk-settings.c
==============================================================================
--- trunk/plugins/groupwise-features/junk-settings.c (original)
+++ trunk/plugins/groupwise-features/junk-settings.c Fri Jun 6 15:12:53 2008
@@ -24,17 +24,7 @@
#endif
#include <glade/glade.h>
#include "junk-settings.h"
-#include <glib/gmain.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkbutton.h>
#include <gtk/gtk.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkcellrenderertoggle.h>
-#include <gtk/gtkcellrenderertext.h>
#include <libgnomeui/gnome-ui-init.h>
#include <libgnome/gnome-init.h>
#include <glib/gi18n.h>
Modified: trunk/plugins/groupwise-features/junk-settings.h
==============================================================================
--- trunk/plugins/groupwise-features/junk-settings.h (original)
+++ trunk/plugins/groupwise-features/junk-settings.h Fri Jun 6 15:12:53 2008
@@ -28,8 +28,6 @@
#pragma }
#endif /* __cplusplus */
-#include <glib.h>
-#include <gtk/gtkvbox.h>
#include <gtk/gtk.h>
#include <camel/camel-store.h>
#include <e-gw-connection.h>
Modified: trunk/plugins/groupwise-features/proxy-login.c
==============================================================================
--- trunk/plugins/groupwise-features/proxy-login.c (original)
+++ trunk/plugins/groupwise-features/proxy-login.c Fri Jun 6 15:12:53 2008
@@ -27,21 +27,9 @@
#include <config.h>
#endif
-#include <glib.h>
#include <string.h>
#include <glib/gi18n.h>
#include <glade/glade.h>
-#include <glib/gmain.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtk.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkcellrenderertoggle.h>
-#include <gtk/gtkcellrenderertext.h>
#include <libedataserverui/e-passwords.h>
#include <mail/mail-component.h>
Modified: trunk/plugins/groupwise-features/proxy-login.h
==============================================================================
--- trunk/plugins/groupwise-features/proxy-login.h (original)
+++ trunk/plugins/groupwise-features/proxy-login.h Fri Jun 6 15:12:53 2008
@@ -19,7 +19,6 @@
* Boston, MA 02110-1301, USA.
*/
-#include <gtk/gtkwidget.h>
#include <gtk/gtk.h>
#define TYPE_PROXY_LOGIN (proxy_login_get_type ())
Modified: trunk/plugins/groupwise-features/proxy.c
==============================================================================
--- trunk/plugins/groupwise-features/proxy.c (original)
+++ trunk/plugins/groupwise-features/proxy.c Fri Jun 6 15:12:53 2008
@@ -28,18 +28,6 @@
#include <stdlib.h>
#include <glib/gi18n.h>
#include <glade/glade.h>
-#include <glib/gmain.h>
-
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtk.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkcellrenderertoggle.h>
-#include <gtk/gtkcellrenderertext.h>
#include <libedataserverui/e-contact-store.h>
Modified: trunk/plugins/groupwise-features/proxy.h
==============================================================================
--- trunk/plugins/groupwise-features/proxy.h (original)
+++ trunk/plugins/groupwise-features/proxy.h Fri Jun 6 15:12:53 2008
@@ -21,7 +21,6 @@
* Boston, MA 02110-1301, USA.
*/
-#include <gtk/gtkwidget.h>
#include <libedataserver/e-account.h>
#include <gtk/gtk.h>
Modified: trunk/plugins/groupwise-features/share-folder.c
==============================================================================
--- trunk/plugins/groupwise-features/share-folder.c (original)
+++ trunk/plugins/groupwise-features/share-folder.c Fri Jun 6 15:12:53 2008
@@ -24,18 +24,7 @@
#endif
#include <glade/glade.h>
#include "share-folder.h"
-#include <glib/gmain.h>
#include <glib/gi18n-lib.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtk.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkcellrenderertoggle.h>
-#include <gtk/gtkcellrenderertext.h>
#include <libedataserverui/e-contact-store.h>
#include <libgnomeui/gnome-ui-init.h>
#include <libgnome/gnome-init.h>
Modified: trunk/plugins/groupwise-features/share-folder.h
==============================================================================
--- trunk/plugins/groupwise-features/share-folder.h (original)
+++ trunk/plugins/groupwise-features/share-folder.h Fri Jun 6 15:12:53 2008
@@ -28,8 +28,6 @@
#pragma }
#endif /* __cplusplus */
-#include <glib.h>
-#include <gtk/gtkvbox.h>
#include <gtk/gtk.h>
#include <camel/camel-store.h>
#include <e-gw-connection.h>
Modified: trunk/plugins/imap-features/imap-headers.c
==============================================================================
--- trunk/plugins/imap-features/imap-headers.c (original)
+++ trunk/plugins/imap-features/imap-headers.c Fri Jun 6 15:12:53 2008
@@ -29,8 +29,6 @@
#include <mail/em-config.h>
#include <mail/mail-config.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtktreemodel.h>
#include <gtk/gtk.h>
#include <libedataserver/e-account.h>
Modified: trunk/plugins/ipod-sync/ical-format.c
==============================================================================
--- trunk/plugins/ipod-sync/ical-format.c (original)
+++ trunk/plugins/ipod-sync/ical-format.c Fri Jun 6 15:12:53 2008
@@ -23,13 +23,8 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
-#include <glib.h>
-#include <glib/gi18n.h>
-#include <gtk/gtkfilechooser.h>
-#include <gtk/gtkfilechooserdialog.h>
-#include <gtk/gtkmessagedialog.h>
-#include <gtk/gtkstock.h>
#include <gtk/gtk.h>
+#include <glib/gi18n.h>
#include <libedataserver/e-source.h>
#include <libedataserverui/e-source-selector.h>
#include <libecal/e-cal.h>
Modified: trunk/plugins/itip-formatter/itip-view.c
==============================================================================
--- trunk/plugins/itip-formatter/itip-view.c (original)
+++ trunk/plugins/itip-formatter/itip-view.c Fri Jun 6 15:12:53 2008
@@ -25,8 +25,6 @@
#endif
#include <string.h>
-#include <glib.h>
-#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <gconf/gconf-client.h>
#include <camel/camel-stream.h>
Modified: trunk/plugins/itip-formatter/itip-view.h
==============================================================================
--- trunk/plugins/itip-formatter/itip-view.h (original)
+++ trunk/plugins/itip-formatter/itip-view.h Fri Jun 6 15:12:53 2008
@@ -25,8 +25,7 @@
#include <stdarg.h>
#include <unistd.h>
-#include <glib-object.h>
-#include <gtk/gtkhbox.h>
+#include <gtk/gtk.h>
#include <libedataserver/e-source-list.h>
#include <libecal/e-cal.h>
Modified: trunk/plugins/mailing-list-actions/mailing-list-actions.c
==============================================================================
--- trunk/plugins/mailing-list-actions/mailing-list-actions.c (original)
+++ trunk/plugins/mailing-list-actions/mailing-list-actions.c Fri Jun 6 15:12:53 2008
@@ -11,15 +11,8 @@
#include <glib/gi18n-lib.h>
#include <stdio.h>
#include <string.h>
+#include <gtk/gtk.h>
#include <gconf/gconf-client.h>
-#include <gtk/gtkcombobox.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkcelllayout.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkdialog.h>
#include <libgnome/gnome-url.h>
#include "camel/camel-multipart.h"
Modified: trunk/plugins/plugin-manager/plugin-manager.c
==============================================================================
--- trunk/plugins/plugin-manager/plugin-manager.c (original)
+++ trunk/plugins/plugin-manager/plugin-manager.c Fri Jun 6 15:12:53 2008
@@ -10,26 +10,11 @@
#include "config.h"
#endif
+#include <gtk/gtk.h>
#include <glib/gi18n-lib.h>
#include <string.h>
#include <stdio.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreesortable.h>
-#include <gtk/gtktreemodelsort.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkcellrenderertoggle.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtknotebook.h>
-
#include "e-util/e-plugin.h"
#include "shell/es-menu.h"
Modified: trunk/plugins/prefer-plain/prefer-plain.c
==============================================================================
--- trunk/plugins/prefer-plain/prefer-plain.c (original)
+++ trunk/plugins/prefer-plain/prefer-plain.c Fri Jun 6 15:12:53 2008
@@ -7,6 +7,7 @@
#include "config.h"
#endif
+#include <gtk/gtk.h>
#include <glib/gi18n-lib.h>
#include <string.h>
#include <stdio.h>
@@ -17,12 +18,6 @@
#include "mail/em-format.h"
#include <gconf/gconf-client.h>
-#include <gtk/gtkcombobox.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkcelllayout.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtklabel.h>
#include "mail/em-config.h"
void org_gnome_prefer_plain_multipart_alternative(void *ep, EMFormatHookTarget *t);
Modified: trunk/plugins/save-attachments/save-attachments.c
==============================================================================
--- trunk/plugins/save-attachments/save-attachments.c (original)
+++ trunk/plugins/save-attachments/save-attachments.c Fri Jun 6 15:12:53 2008
@@ -28,26 +28,10 @@
#include <string.h>
#include <stdio.h>
-#include <glib.h>
+#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <glib/gstdio.h>
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkmessagedialog.h>
-#include <gtk/gtktreestore.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkcellrenderertoggle.h>
-#include <gtk/gtkbox.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtkfilechooser.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkalignment.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkfilechooserbutton.h>
-
#include <camel/camel-folder.h>
#include <camel/camel-exception.h>
#include <camel/camel-mime-message.h>
Modified: trunk/plugins/save-calendar/csv-format.c
==============================================================================
--- trunk/plugins/save-calendar/csv-format.c (original)
+++ trunk/plugins/save-calendar/csv-format.c Fri Jun 6 15:12:53 2008
@@ -22,13 +22,9 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
-#include <glib.h>
-#include <glib/gi18n.h>
-#include <gtk/gtkfilechooser.h>
-#include <gtk/gtkfilechooserdialog.h>
-#include <gtk/gtkmessagedialog.h>
-#include <gtk/gtkstock.h>
+
#include <gtk/gtk.h>
+#include <glib/gi18n.h>
#include <libedataserver/e-source.h>
#include <libecal/e-cal-time-util.h>
#include <libedataserver/e-data-server-util.h>
Modified: trunk/plugins/save-calendar/ical-format.c
==============================================================================
--- trunk/plugins/save-calendar/ical-format.c (original)
+++ trunk/plugins/save-calendar/ical-format.c Fri Jun 6 15:12:53 2008
@@ -23,13 +23,9 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
-#include <glib.h>
-#include <glib/gi18n.h>
-#include <gtk/gtkfilechooser.h>
-#include <gtk/gtkfilechooserdialog.h>
-#include <gtk/gtkmessagedialog.h>
-#include <gtk/gtkstock.h>
+
#include <gtk/gtk.h>
+#include <glib/gi18n.h>
#include <libedataserver/e-source.h>
#include <libedataserverui/e-source-selector.h>
#include <libecal/e-cal.h>
Modified: trunk/plugins/save-calendar/rdf-format.c
==============================================================================
--- trunk/plugins/save-calendar/rdf-format.c (original)
+++ trunk/plugins/save-calendar/rdf-format.c Fri Jun 6 15:12:53 2008
@@ -22,13 +22,9 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
-#include <glib.h>
-#include <glib/gi18n.h>
-#include <gtk/gtkfilechooser.h>
-#include <gtk/gtkfilechooserdialog.h>
-#include <gtk/gtkmessagedialog.h>
-#include <gtk/gtkstock.h>
+
#include <gtk/gtk.h>
+#include <glib/gi18n.h>
#include <libedataserver/e-source.h>
#include <libedataserverui/e-source-selector.h>
#include <libecal/e-cal.h>
Modified: trunk/plugins/save-calendar/save-calendar.c
==============================================================================
--- trunk/plugins/save-calendar/save-calendar.c (original)
+++ trunk/plugins/save-calendar/save-calendar.c Fri Jun 6 15:12:53 2008
@@ -26,14 +26,8 @@
#include <config.h>
#endif
-#include <glib.h>
-#include <glib/gi18n.h>
-#include <gio/gio.h>
-#include <gtk/gtkfilechooser.h>
-#include <gtk/gtkfilechooserdialog.h>
-#include <gtk/gtkmessagedialog.h>
-#include <gtk/gtkstock.h>
#include <gtk/gtk.h>
+#include <glib/gi18n.h>
#include <libedataserver/e-source.h>
#include <libedataserverui/e-source-selector.h>
#include <libecal/e-cal.h>
Modified: trunk/shell/e-history.h
==============================================================================
--- trunk/shell/e-history.h (original)
+++ trunk/shell/e-history.h Fri Jun 6 15:12:53 2008
@@ -23,7 +23,7 @@
#ifndef _E_HISTORY_H_
#define _E_HISTORY_H_
-#include <gnome.h>
+#include <gtk/gtk.h>
#ifdef __cplusplus
extern "C" {
Modified: trunk/shell/e-shell-folder-title-bar.c
==============================================================================
--- trunk/shell/e-shell-folder-title-bar.c (original)
+++ trunk/shell/e-shell-folder-title-bar.c Fri Jun 6 15:12:53 2008
@@ -25,14 +25,7 @@
#endif
#include <string.h>
-#include <gtk/gtkarrow.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkrc.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtktogglebutton.h>
#include <glib/gi18n.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
#include "e-shell-constants.h"
#include "e-shell-marshal.h"
Modified: trunk/shell/e-shell-folder-title-bar.h
==============================================================================
--- trunk/shell/e-shell-folder-title-bar.h (original)
+++ trunk/shell/e-shell-folder-title-bar.h Fri Jun 6 15:12:53 2008
@@ -23,8 +23,7 @@
#ifndef __E_SHELL_FOLDER_TITLE_BAR_H__
#define __E_SHELL_FOLDER_TITLE_BAR_H__
-#include <gtk/gtkhbox.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gtk/gtk.h>
#ifdef __cplusplus
extern "C" {
Modified: trunk/shell/e-shell-importer.c
==============================================================================
--- trunk/shell/e-shell-importer.c (original)
+++ trunk/shell/e-shell-importer.c Fri Jun 6 15:12:53 2008
@@ -27,8 +27,7 @@
#include <unistd.h>
#include <string.h>
-#include <glib.h>
-
+#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
#include <glade/glade.h>
@@ -39,8 +38,6 @@
#include <libgnomeui/gnome-druid-page-edge.h>
#include <libgnomeui/gnome-druid-page-standard.h>
-#include <gtk/gtkfilechooserbutton.h>
-
#include "misc/e-gui-utils.h"
#include "e-util/e-dialog-utils.h"
Modified: trunk/shell/e-shell-settings-dialog.c
==============================================================================
--- trunk/shell/e-shell-settings-dialog.c (original)
+++ trunk/shell/e-shell-settings-dialog.c Fri Jun 6 15:12:53 2008
@@ -37,6 +37,7 @@
#include <bonobo-activation/bonobo-activation.h>
+#include <stdlib.h>
#include <string.h>
struct _EShellSettingsDialogPrivate {
Modified: trunk/shell/e-shell-view.c
==============================================================================
--- trunk/shell/e-shell-view.c (original)
+++ trunk/shell/e-shell-view.c Fri Jun 6 15:12:53 2008
@@ -26,9 +26,7 @@
#include <config.h>
#endif
-#include <glib.h>
-
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include "e-shell-view.h"
Modified: trunk/shell/e-shell-window.c
==============================================================================
--- trunk/shell/e-shell-window.c (original)
+++ trunk/shell/e-shell-window.c Fri Jun 6 15:12:53 2008
@@ -38,15 +38,7 @@
#include "es-menu.h"
#include "es-event.h"
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkhpaned.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtknotebook.h>
-#include <gtk/gtktooltips.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkiconfactory.h>
+#include <gtk/gtk.h>
#include <bonobo/bonobo-exception.h>
#include <bonobo/bonobo-object.h>
Modified: trunk/shell/e-shell.c
==============================================================================
--- trunk/shell/e-shell.c (original)
+++ trunk/shell/e-shell.c Fri Jun 6 15:12:53 2008
@@ -23,14 +23,12 @@
#include <config.h>
#include <string.h>
+#include <unistd.h>
#include <sys/types.h>
-#include <glib.h>
+#include <gtk/gtk.h>
#include <glib/gstdio.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtksignal.h>
-
#ifdef GDK_WINDOWING_X11
#include <gdk/gdkprivate.h>
#include <gdk/gdkx.h>
Modified: trunk/shell/e-sidebar.c
==============================================================================
--- trunk/shell/e-sidebar.c (original)
+++ trunk/shell/e-sidebar.c Fri Jun 6 15:12:53 2008
@@ -28,12 +28,6 @@
#include "e-shell-marshal.h"
-#include <gtk/gtk.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtktogglebutton.h>
-
#include <gconf/gconf-client.h>
#include <libgnome/gnome-gconf.h>
Modified: trunk/shell/e-sidebar.h
==============================================================================
--- trunk/shell/e-sidebar.h (original)
+++ trunk/shell/e-sidebar.h Fri Jun 6 15:12:53 2008
@@ -23,7 +23,7 @@
#ifndef _E_SIDEBAR_H_
#define _E_SIDEBAR_H_
-#include <gtk/gtkcontainer.h>
+#include <gtk/gtk.h>
#define E_TYPE_SIDEBAR (e_sidebar_get_type ())
#define E_SIDEBAR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_SIDEBAR, ESidebar))
Modified: trunk/shell/e-user-creatable-items-handler.c
==============================================================================
--- trunk/shell/e-user-creatable-items-handler.c (original)
+++ trunk/shell/e-user-creatable-items-handler.c Fri Jun 6 15:12:53 2008
@@ -36,16 +36,9 @@
#include <bonobo/bonobo-exception.h>
#include <bonobo/bonobo-control.h>
+#include <gtk/gtk.h>
#include <glib/gi18n.h>
-#include <gtk/gtkaccelgroup.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkimagemenuitem.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkseparatormenuitem.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtktooltips.h>
-
#include <stdlib.h>
#include <ctype.h>
#include <string.h>
Modified: trunk/shell/evolution-config-control.c
==============================================================================
--- trunk/shell/evolution-config-control.c (original)
+++ trunk/shell/evolution-config-control.c Fri Jun 6 15:12:53 2008
@@ -30,8 +30,6 @@
#include <e-util/e-util.h>
-#include <gtk/gtksignal.h>
-
#include <bonobo/bonobo-control.h>
#include <bonobo/bonobo-event-source.h>
Modified: trunk/shell/evolution-config-control.h
==============================================================================
--- trunk/shell/evolution-config-control.h (original)
+++ trunk/shell/evolution-config-control.h Fri Jun 6 15:12:53 2008
@@ -26,7 +26,7 @@
#include "Evolution.h"
#include <bonobo/bonobo-object.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
#ifdef cplusplus
extern "C" {
Modified: trunk/shell/evolution-shell-component-utils.h
==============================================================================
--- trunk/shell/evolution-shell-component-utils.h (original)
+++ trunk/shell/evolution-shell-component-utils.h Fri Jun 6 15:12:53 2008
@@ -22,7 +22,7 @@
#define __EVOLUTION_SHELL_COMPONENT_UTILS_H__
#include <bonobo/bonobo-ui-component.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
#ifdef __cplusplus
extern "C" {
Modified: trunk/shell/main.c
==============================================================================
--- trunk/shell/main.c (original)
+++ trunk/shell/main.c Fri Jun 6 15:12:53 2008
@@ -22,7 +22,7 @@
#include <config.h>
-#include <glib.h>
+#include <gtk/gtk.h>
#include <glib/gstdio.h>
#ifdef G_OS_WIN32
@@ -50,18 +50,6 @@
#include <gconf/gconf-client.h>
-#include <gtk/gtkalignment.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkcheckbutton.h>
-
#include <glib/gi18n.h>
#include <libgnome/gnome-util.h>
#include <libgnome/gnome-sound.h>
Modified: trunk/smime/gui/ca-trust-dialog.c
==============================================================================
--- trunk/smime/gui/ca-trust-dialog.c (original)
+++ trunk/smime/gui/ca-trust-dialog.c Fri Jun 6 15:12:53 2008
@@ -28,8 +28,6 @@
#include "ca-trust-dialog.h"
#include "certificate-viewer.h"
-#include <gtk/gtk.h>
-
#include <glib/gi18n.h>
#include <glade/glade.h>
Modified: trunk/smime/gui/ca-trust-dialog.h
==============================================================================
--- trunk/smime/gui/ca-trust-dialog.h (original)
+++ trunk/smime/gui/ca-trust-dialog.h Fri Jun 6 15:12:53 2008
@@ -23,7 +23,7 @@
#ifndef _CA_TRUST_DIALOG_H_
#define _CA_TRUST_DIALOG_H
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
#include "e-cert.h"
GtkWidget* ca_trust_dialog_show (ECert *cert, gboolean importing);
Modified: trunk/smime/gui/cert-trust-dialog.c
==============================================================================
--- trunk/smime/gui/cert-trust-dialog.c (original)
+++ trunk/smime/gui/cert-trust-dialog.c Fri Jun 6 15:12:53 2008
@@ -31,10 +31,7 @@
#include "cert-trust-dialog.h"
#include "ca-trust-dialog.h"
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkradiobutton.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtklabel.h>
+#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <glade/glade.h>
Modified: trunk/smime/gui/certificate-viewer.c
==============================================================================
--- trunk/smime/gui/certificate-viewer.c (original)
+++ trunk/smime/gui/certificate-viewer.c Fri Jun 6 15:12:53 2008
@@ -29,8 +29,6 @@
#include "e-asn1-object.h"
-#include <gtk/gtk.h>
-
#include <glib/gi18n.h>
#include <glade/glade.h>
Modified: trunk/smime/gui/certificate-viewer.h
==============================================================================
--- trunk/smime/gui/certificate-viewer.h (original)
+++ trunk/smime/gui/certificate-viewer.h Fri Jun 6 15:12:53 2008
@@ -23,7 +23,7 @@
#ifndef _CERTIFICATE_VIEWER_H_
#define _CERTIFICATE_VIEWER_H
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
#include "e-cert.h"
GtkWidget* certificate_viewer_show (ECert *cert);
Modified: trunk/smime/gui/e-cert-selector.c
==============================================================================
--- trunk/smime/gui/e-cert-selector.c (original)
+++ trunk/smime/gui/e-cert-selector.c Fri Jun 6 15:12:53 2008
@@ -25,12 +25,6 @@
#include <glib/gi18n.h>
-#include <gtk/gtktextview.h>
-#include <gtk/gtkoptionmenu.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkbox.h>
-#include <gtk/gtkstock.h>
-
#include "nss.h"
#include "pk11func.h"
#include "certdb.h"
Modified: trunk/smime/gui/e-cert-selector.h
==============================================================================
--- trunk/smime/gui/e-cert-selector.h (original)
+++ trunk/smime/gui/e-cert-selector.h Fri Jun 6 15:12:53 2008
@@ -24,7 +24,7 @@
#ifndef E_CERT_SELECTOR_H
#define E_CERT_SELECTOR_H
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
#ifdef cplusplus
extern "C" {
Modified: trunk/smime/lib/e-cert-db.c
==============================================================================
--- trunk/smime/lib/e-cert-db.c (original)
+++ trunk/smime/lib/e-cert-db.c Fri Jun 6 15:12:53 2008
@@ -60,7 +60,8 @@
#include <config.h>
#endif
-#include <glib.h>
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
#include <glib/gstdio.h>
/* XXX toshok why oh *why* god WHY did they do this? no fucking
@@ -90,8 +91,6 @@
#include "e-util/e-util.h"
#include "e-util/e-dialog-utils.h"
#include "e-util/e-util-private.h"
-#include <gtk/gtkmessagedialog.h>
-#include <glib/gi18n.h>
#include <libedataserverui/e-passwords.h>
#include <sys/types.h>
#include <sys/stat.h>
Modified: trunk/widgets/e-timezone-dialog/e-timezone-dialog.c
==============================================================================
--- trunk/widgets/e-timezone-dialog/e-timezone-dialog.c (original)
+++ trunk/widgets/e-timezone-dialog/e-timezone-dialog.c Fri Jun 6 15:12:53 2008
@@ -26,13 +26,6 @@
#include <string.h>
#include <glib/gi18n.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkcombobox.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkcelllayout.h>
-#include <gtk/gtklabel.h>
-#include <gnome.h>
#include <glade/glade.h>
#include <misc/e-map.h>
#include <libecal/e-cal-time-util.h>
Modified: trunk/widgets/e-timezone-dialog/e-timezone-dialog.h
==============================================================================
--- trunk/widgets/e-timezone-dialog/e-timezone-dialog.h (original)
+++ trunk/widgets/e-timezone-dialog/e-timezone-dialog.h Fri Jun 6 15:12:53 2008
@@ -22,7 +22,7 @@
#ifndef __E_TIMEZONE_DIALOG_H__
#define __E_TIMEZONE_DIALOG_H__
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
#include <libical/ical.h>
Modified: trunk/widgets/menus/gal-define-views-dialog.c
==============================================================================
--- trunk/widgets/menus/gal-define-views-dialog.c (original)
+++ trunk/widgets/menus/gal-define-views-dialog.c Fri Jun 6 15:12:53 2008
@@ -23,8 +23,6 @@
#include <config.h>
-#include <gtk/gtk.h>
-#include <gtk/gtklabel.h>
#include <glib/gi18n.h>
#include "e-util/e-util.h"
Modified: trunk/widgets/menus/gal-define-views-dialog.h
==============================================================================
--- trunk/widgets/menus/gal-define-views-dialog.h (original)
+++ trunk/widgets/menus/gal-define-views-dialog.h Fri Jun 6 15:12:53 2008
@@ -24,9 +24,7 @@
#ifndef __GAL_DEFINE_VIEWS_DIALOG_H__
#define __GAL_DEFINE_VIEWS_DIALOG_H__
-#include <gtk/gtkdialog.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtktreemodel.h>
+#include <gtk/gtk.h>
#include <glade/glade.h>
#include <widgets/menus/gal-view-collection.h>
Modified: trunk/widgets/menus/gal-view-collection.h
==============================================================================
--- trunk/widgets/menus/gal-view-collection.h (original)
+++ trunk/widgets/menus/gal-view-collection.h Fri Jun 6 15:12:53 2008
@@ -24,7 +24,7 @@
#ifndef _GAL_VIEW_SET_H_
#define _GAL_VIEW_SET_H_
-#include <gtk/gtkobject.h>
+#include <glib-object.h>
#include <widgets/menus/gal-view-factory.h>
G_BEGIN_DECLS
Modified: trunk/widgets/menus/gal-view-etable.h
==============================================================================
--- trunk/widgets/menus/gal-view-etable.h (original)
+++ trunk/widgets/menus/gal-view-etable.h Fri Jun 6 15:12:53 2008
@@ -24,7 +24,7 @@
#ifndef _GAL_VIEW_ETABLE_H_
#define _GAL_VIEW_ETABLE_H_
-#include <gtk/gtkobject.h>
+#include <gtk/gtk.h>
#include <widgets/menus/gal-view.h>
#include <table/e-table-state.h>
#include <table/e-table-specification.h>
Modified: trunk/widgets/menus/gal-view-factory-etable.h
==============================================================================
--- trunk/widgets/menus/gal-view-factory-etable.h (original)
+++ trunk/widgets/menus/gal-view-factory-etable.h Fri Jun 6 15:12:53 2008
@@ -24,7 +24,7 @@
#ifndef _GAL_VIEW_FACTORY_ETABLE_H_
#define _GAL_VIEW_FACTORY_ETABLE_H_
-#include <gtk/gtkobject.h>
+#include <gtk/gtk.h>
#include <widgets/menus/gal-view-factory.h>
#include <table/e-table-specification.h>
Modified: trunk/widgets/menus/gal-view-factory.h
==============================================================================
--- trunk/widgets/menus/gal-view-factory.h (original)
+++ trunk/widgets/menus/gal-view-factory.h Fri Jun 6 15:12:53 2008
@@ -24,7 +24,7 @@
#ifndef _GAL_VIEW_FACTORY_H_
#define _GAL_VIEW_FACTORY_H_
-#include <gtk/gtkobject.h>
+#include <glib-object.h>
#include <widgets/menus/gal-view.h>
#ifdef __cplusplus
Modified: trunk/widgets/menus/gal-view-instance-save-as-dialog.c
==============================================================================
--- trunk/widgets/menus/gal-view-instance-save-as-dialog.c (original)
+++ trunk/widgets/menus/gal-view-instance-save-as-dialog.c Fri Jun 6 15:12:53 2008
@@ -23,8 +23,6 @@
#include <config.h>
-#include <gtk/gtk.h>
-
#include <glib/gi18n.h>
#include "e-util/e-util.h"
#include "e-util/e-util-private.h"
Modified: trunk/widgets/menus/gal-view-instance-save-as-dialog.h
==============================================================================
--- trunk/widgets/menus/gal-view-instance-save-as-dialog.h (original)
+++ trunk/widgets/menus/gal-view-instance-save-as-dialog.h Fri Jun 6 15:12:53 2008
@@ -24,10 +24,8 @@
#ifndef __GAL_VIEW_INSTANCE_SAVE_AS_DIALOG_H__
#define __GAL_VIEW_INSTANCE_SAVE_AS_DIALOG_H__
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
#include <glade/glade.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtktreemodel.h>
#include <widgets/menus/gal-view-collection.h>
#include <widgets/menus/gal-view-instance.h>
Modified: trunk/widgets/menus/gal-view-instance.h
==============================================================================
--- trunk/widgets/menus/gal-view-instance.h (original)
+++ trunk/widgets/menus/gal-view-instance.h Fri Jun 6 15:12:53 2008
@@ -24,7 +24,7 @@
#ifndef _GAL_VIEW_INSTANCE_H_
#define _GAL_VIEW_INSTANCE_H_
-#include <gtk/gtkobject.h>
+#include <glib-object.h>
#include <widgets/menus/gal-view-collection.h>
#include <misc/e-popup-menu.h>
Modified: trunk/widgets/menus/gal-view-new-dialog.c
==============================================================================
--- trunk/widgets/menus/gal-view-new-dialog.c (original)
+++ trunk/widgets/menus/gal-view-new-dialog.c Fri Jun 6 15:12:53 2008
@@ -23,8 +23,6 @@
#include <config.h>
-#include <gtk/gtk.h>
-
#include "table/e-table-scrolled.h"
#include <glib/gi18n.h>
#include "e-util/e-util.h"
Modified: trunk/widgets/menus/gal-view-new-dialog.h
==============================================================================
--- trunk/widgets/menus/gal-view-new-dialog.h (original)
+++ trunk/widgets/menus/gal-view-new-dialog.h Fri Jun 6 15:12:53 2008
@@ -24,8 +24,7 @@
#ifndef __GAL_VIEW_NEW_DIALOG_H__
#define __GAL_VIEW_NEW_DIALOG_H__
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkliststore.h>
+#include <gtk/gtk.h>
#include <glade/glade.h>
#include <gal-view-collection.h>
Modified: trunk/widgets/menus/gal-view.h
==============================================================================
--- trunk/widgets/menus/gal-view.h (original)
+++ trunk/widgets/menus/gal-view.h Fri Jun 6 15:12:53 2008
@@ -24,7 +24,7 @@
#ifndef _GAL_VIEW_H_
#define _GAL_VIEW_H_
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
#include <libxml/tree.h>
#ifdef __cplusplus
Modified: trunk/widgets/misc/e-activity-handler.c
==============================================================================
--- trunk/widgets/misc/e-activity-handler.c (original)
+++ trunk/widgets/misc/e-activity-handler.c Fri Jun 6 15:12:53 2008
@@ -551,9 +551,9 @@
unsigned int activity_id;
GSList *p;
char *information = g_object_get_data((GObject *) error, "primary");
- priv = activity_handler->priv;
const char *img;
+ priv = activity_handler->priv;
activity_id = get_new_activity_id (activity_handler);
activity_info = activity_info_new (component_id, activity_id, NULL, information, TRUE);
Modified: trunk/widgets/misc/e-attachment.c
==============================================================================
--- trunk/widgets/misc/e-attachment.c (original)
+++ trunk/widgets/misc/e-attachment.c Fri Jun 6 15:12:53 2008
@@ -26,8 +26,6 @@
#include <config.h>
#endif
-#include <glib.h>
-
#ifdef G_OS_WIN32
/* Include <windows.h> early (as the gio stuff below will
* include it anyway, sigh) to workaround the DATADIR problem.
@@ -46,11 +44,6 @@
#include <errno.h>
#include <camel/camel.h>
-#include <gtk/gtk.h>
-#include <gtk/gtknotebook.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkdialog.h>
-#include <gio/gio.h>
#include <glib/gi18n.h>
#include <glib/gstdio.h>
Modified: trunk/widgets/misc/e-attachment.h
==============================================================================
--- trunk/widgets/misc/e-attachment.h (original)
+++ trunk/widgets/misc/e-attachment.h Fri Jun 6 15:12:53 2008
@@ -25,13 +25,11 @@
#ifndef __E_ATTACHMENT_H__
#define __E_ATTACHMENT_H__
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
#include <glade/glade-xml.h>
#include <camel/camel-mime-part.h>
#include <camel/camel-exception.h>
#include <camel/camel-cipher-context.h>
-#include <gio/gio.h>
#ifdef __cplusplus
extern "C" {
Modified: trunk/widgets/misc/e-calendar-item.c
==============================================================================
--- trunk/widgets/misc/e-calendar-item.c (original)
+++ trunk/widgets/misc/e-calendar-item.c Fri Jun 6 15:12:53 2008
@@ -36,12 +36,7 @@
#include <time.h>
#include <string.h>
-#include <glib.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtksignal.h>
+#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
#include <glib/gi18n.h>
#include <libedataserver/e-data-server-util.h>
Modified: trunk/widgets/misc/e-calendar.c
==============================================================================
--- trunk/widgets/misc/e-calendar.c (original)
+++ trunk/widgets/misc/e-calendar.c Fri Jun 6 15:12:53 2008
@@ -36,12 +36,7 @@
#include "e-calendar.h"
-#include <glib.h>
-#include <gtk/gtkarrow.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkpixmap.h>
-#include <gtk/gtksignal.h>
+#include <gtk/gtk.h>
#include <libgnomecanvas/gnome-canvas-widget.h>
#include <glib/gi18n.h>
Modified: trunk/widgets/misc/e-calendar.h
==============================================================================
--- trunk/widgets/misc/e-calendar.h (original)
+++ trunk/widgets/misc/e-calendar.h Fri Jun 6 15:12:53 2008
@@ -23,7 +23,7 @@
#ifndef _E_CALENDAR_H_
#define _E_CALENDAR_H_
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
#include <misc/e-canvas.h>
#include "e-calendar-item.h"
Modified: trunk/widgets/misc/e-canvas-vbox.h
==============================================================================
--- trunk/widgets/misc/e-canvas-vbox.h (original)
+++ trunk/widgets/misc/e-canvas-vbox.h Fri Jun 6 15:12:53 2008
@@ -24,7 +24,7 @@
#ifndef __E_CANVAS_VBOX_H__
#define __E_CANVAS_VBOX_H__
-#include <gtk/gtktypeutils.h>
+#include <gtk/gtk.h>
#include <libgnomecanvas/gnome-canvas.h>
#ifdef __cplusplus
Modified: trunk/widgets/misc/e-canvas.h
==============================================================================
--- trunk/widgets/misc/e-canvas.h (original)
+++ trunk/widgets/misc/e-canvas.h Fri Jun 6 15:12:53 2008
@@ -24,7 +24,7 @@
#ifndef __E_CANVAS_H__
#define __E_CANVAS_H__
-#include <gtk/gtkimcontext.h>
+#include <gtk/gtk.h>
#include <libgnomecanvas/gnome-canvas.h>
#ifdef __cplusplus
Modified: trunk/widgets/misc/e-cell-renderer-combo.c
==============================================================================
--- trunk/widgets/misc/e-cell-renderer-combo.c (original)
+++ trunk/widgets/misc/e-cell-renderer-combo.c Fri Jun 6 15:12:53 2008
@@ -24,10 +24,6 @@
#include <config.h>
#endif
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkarrow.h>
-#include <gtk/gtkbutton.h>
-
#include "e-combo-cell-editable.h"
#include "e-cell-renderer-combo.h"
Modified: trunk/widgets/misc/e-cell-renderer-combo.h
==============================================================================
--- trunk/widgets/misc/e-cell-renderer-combo.h (original)
+++ trunk/widgets/misc/e-cell-renderer-combo.h Fri Jun 6 15:12:53 2008
@@ -23,7 +23,7 @@
#ifndef __E_CELL_RENDERER_COMBO_H__
#define __E_CELL_RENDERER_COMBO_H__
-#include <gtk/gtkcellrenderertext.h>
+#include <gtk/gtk.h>
G_BEGIN_DECLS
Modified: trunk/widgets/misc/e-colors.c
==============================================================================
--- trunk/widgets/misc/e-colors.c (original)
+++ trunk/widgets/misc/e-colors.c Fri Jun 6 15:12:53 2008
@@ -27,8 +27,6 @@
#include <config.h>
-#include <gtk/gtk.h>
-
#include "e-colors.h"
GdkColor e_white, e_dark_gray, e_black;
Modified: trunk/widgets/misc/e-colors.h
==============================================================================
--- trunk/widgets/misc/e-colors.h (original)
+++ trunk/widgets/misc/e-colors.h Fri Jun 6 15:12:53 2008
@@ -24,9 +24,7 @@
#ifndef GNOME_APP_LIBS_COLOR_H
#define GNOME_APP_LIBS_COLOR_H
-#include <glib.h>
-#include <gdk/gdk.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
G_BEGIN_DECLS
Modified: trunk/widgets/misc/e-combo-button.c
==============================================================================
--- trunk/widgets/misc/e-combo-button.c (original)
+++ trunk/widgets/misc/e-combo-button.c Fri Jun 6 15:12:53 2008
@@ -28,14 +28,6 @@
#include "ea-widgets.h"
#include <e-util/e-icon-factory.h>
-#include <gtk/gtkarrow.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtksignal.h>
-
struct _EComboButtonPrivate {
GdkPixbuf *icon;
Modified: trunk/widgets/misc/e-combo-button.h
==============================================================================
--- trunk/widgets/misc/e-combo-button.h (original)
+++ trunk/widgets/misc/e-combo-button.h Fri Jun 6 15:12:53 2008
@@ -27,10 +27,7 @@
#include <config.h>
#endif
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkmenu.h>
-
-#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gtk/gtk.h>
#ifdef __cplusplus
extern "C" {
Modified: trunk/widgets/misc/e-combo-cell-editable.c
==============================================================================
--- trunk/widgets/misc/e-combo-cell-editable.c (original)
+++ trunk/widgets/misc/e-combo-cell-editable.c Fri Jun 6 15:12:53 2008
@@ -22,18 +22,6 @@
#include <config.h>
#include <gdk/gdkkeysyms.h>
-#include <gtk/gtkarrow.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkcelleditable.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtkwindow.h>
#include "e-combo-cell-editable.h"
Modified: trunk/widgets/misc/e-combo-cell-editable.h
==============================================================================
--- trunk/widgets/misc/e-combo-cell-editable.h (original)
+++ trunk/widgets/misc/e-combo-cell-editable.h Fri Jun 6 15:12:53 2008
@@ -23,7 +23,7 @@
#ifndef __E_COMBO_CELL_EDITABLE_H__
#define __E_COMBO_CELL_EDITABLE_H__
-#include <gtk/gtkeventbox.h>
+#include <gtk/gtk.h>
G_BEGIN_DECLS
Modified: trunk/widgets/misc/e-config-page.h
==============================================================================
--- trunk/widgets/misc/e-config-page.h (original)
+++ trunk/widgets/misc/e-config-page.h Fri Jun 6 15:12:53 2008
@@ -27,7 +27,7 @@
#include <config.h>
#endif
-#include <gnome.h>
+#include <gtk/gtk.h>
#ifdef __cplusplus
extern "C" {
Modified: trunk/widgets/misc/e-dateedit.c
==============================================================================
--- trunk/widgets/misc/e-dateedit.c (original)
+++ trunk/widgets/misc/e-dateedit.c Fri Jun 6 15:12:53 2008
@@ -42,21 +42,6 @@
#include <stdlib.h>
#include <string.h>
#include <gdk/gdkkeysyms.h>
-#include <gtk/gtkarrow.h>
-#include <gtk/gtkbbox.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkcomboboxentry.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkcelllayout.h>
-#include <gtk/gtkdrawingarea.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtkhbbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkmessagedialog.h>
#include <atk/atkrelation.h>
#include <atk/atkrelationset.h>
#include <glib/gi18n.h>
Modified: trunk/widgets/misc/e-dateedit.h
==============================================================================
--- trunk/widgets/misc/e-dateedit.h (original)
+++ trunk/widgets/misc/e-dateedit.h Fri Jun 6 15:12:53 2008
@@ -41,9 +41,7 @@
#define __E_DATE_EDIT_H_
#include <time.h>
-#include <glib.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
#define E_TYPE_DATE_EDIT (e_date_edit_get_type ())
#define E_DATE_EDIT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_DATE_EDIT, EDateEdit))
Modified: trunk/widgets/misc/e-dropdown-button.c
==============================================================================
--- trunk/widgets/misc/e-dropdown-button.c (original)
+++ trunk/widgets/misc/e-dropdown-button.c Fri Jun 6 15:12:53 2008
@@ -29,11 +29,6 @@
#include "e-dropdown-button.h"
#include <stdio.h>
-#include <gtk/gtkarrow.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkwidget.h>
#include <libgnomeui/gnome-popup-menu.h>
struct _EDropdownButtonPrivate {
Modified: trunk/widgets/misc/e-dropdown-button.h
==============================================================================
--- trunk/widgets/misc/e-dropdown-button.h (original)
+++ trunk/widgets/misc/e-dropdown-button.h Fri Jun 6 15:12:53 2008
@@ -27,8 +27,7 @@
#include <config.h>
#endif
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkmenu.h>
+#include <gtk/gtk.h>
#ifdef __cplusplus
extern "C" {
Modified: trunk/widgets/misc/e-expander.c
==============================================================================
--- trunk/widgets/misc/e-expander.c (original)
+++ trunk/widgets/misc/e-expander.c Fri Jun 6 15:12:53 2008
@@ -26,8 +26,6 @@
#include "e-expander.h"
#include "ea-widgets.h"
-#include <gtk/gtklabel.h>
-#include <gtk/gtkcontainer.h>
#include <gdk/gdkkeysyms.h>
#define DEFAULT_EXPANDER_SIZE 10
Modified: trunk/widgets/misc/e-expander.h
==============================================================================
--- trunk/widgets/misc/e-expander.h (original)
+++ trunk/widgets/misc/e-expander.h Fri Jun 6 15:12:53 2008
@@ -24,7 +24,7 @@
#ifndef _E_EXPANDER_H_
#define _E_EXPANDER_H_
-#include <gtk/gtkbin.h>
+#include <gtk/gtk.h>
G_BEGIN_DECLS
Modified: trunk/widgets/misc/e-gui-utils.h
==============================================================================
--- trunk/widgets/misc/e-gui-utils.h (original)
+++ trunk/widgets/misc/e-gui-utils.h Fri Jun 6 15:12:53 2008
@@ -24,9 +24,7 @@
#ifndef GAL_GUI_UTILS_H
#define GAL_GUI_UTILS_H
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkwindow.h>
-
+#include <gtk/gtk.h>
#include <glade/glade-xml.h>
G_BEGIN_DECLS
Modified: trunk/widgets/misc/e-icon-entry.c
==============================================================================
--- trunk/widgets/misc/e-icon-entry.c (original)
+++ trunk/widgets/misc/e-icon-entry.c Fri Jun 6 15:12:53 2008
@@ -36,12 +36,6 @@
#include "e-icon-entry.h"
-#include <gtk/gtkentry.h>
-#include <gtk/gtkbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkeventbox.h>
-#include <gtk/gtkimage.h>
-
#define E_ICON_ENTRY_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), E_TYPE_ICON_ENTRY, EIconEntryPrivate))
struct _EIconEntryPrivate
Modified: trunk/widgets/misc/e-icon-entry.h
==============================================================================
--- trunk/widgets/misc/e-icon-entry.h (original)
+++ trunk/widgets/misc/e-icon-entry.h Fri Jun 6 15:12:53 2008
@@ -37,7 +37,7 @@
#ifndef E_ICON_ENTRY_H
#define E_ICON_ENTRY_H
-#include <gtk/gtkbin.h>
+#include <gtk/gtk.h>
G_BEGIN_DECLS
Modified: trunk/widgets/misc/e-image-chooser.c
==============================================================================
--- trunk/widgets/misc/e-image-chooser.c (original)
+++ trunk/widgets/misc/e-image-chooser.c Fri Jun 6 15:12:53 2008
@@ -23,12 +23,6 @@
#include <stdio.h>
#include <string.h>
-#include <gtk/gtkalignment.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkdnd.h>
-
#include <glib/gi18n.h>
#include "e-image-chooser.h"
Modified: trunk/widgets/misc/e-image-chooser.h
==============================================================================
--- trunk/widgets/misc/e-image-chooser.h (original)
+++ trunk/widgets/misc/e-image-chooser.h Fri Jun 6 15:12:53 2008
@@ -21,7 +21,7 @@
#ifndef _E_IMAGE_CHOOSER_H_
#define _E_IMAGE_CHOOSER_H_
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
G_BEGIN_DECLS
Modified: trunk/widgets/misc/e-info-label.c
==============================================================================
--- trunk/widgets/misc/e-info-label.c (original)
+++ trunk/widgets/misc/e-info-label.c Fri Jun 6 15:12:53 2008
@@ -24,10 +24,8 @@
#endif
#include <string.h>
-#include <gtk/gtkimage.h>
#include "e-info-label.h"
-#include <gtk/gtklabel.h>
#include <e-util/e-icon-factory.h>
Modified: trunk/widgets/misc/e-info-label.h
==============================================================================
--- trunk/widgets/misc/e-info-label.h (original)
+++ trunk/widgets/misc/e-info-label.h Fri Jun 6 15:12:53 2008
@@ -22,7 +22,7 @@
#ifndef _E_INFO_LABEL_H
#define _E_INFO_LABEL_H
-#include <gtk/gtkhbox.h>
+#include <gtk/gtk.h>
#ifdef __cplusplus
extern "C" {
Modified: trunk/widgets/misc/e-map.c
==============================================================================
--- trunk/widgets/misc/e-map.c (original)
+++ trunk/widgets/misc/e-map.c Fri Jun 6 15:12:53 2008
@@ -24,8 +24,6 @@
#include <math.h>
#include <stdlib.h>
#include <gdk/gdkkeysyms.h>
-#include <gtk/gtksignal.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
#include <glib/gi18n.h>
#include "e-util/e-util-private.h"
Modified: trunk/widgets/misc/e-map.h
==============================================================================
--- trunk/widgets/misc/e-map.h (original)
+++ trunk/widgets/misc/e-map.h Fri Jun 6 15:12:53 2008
@@ -23,7 +23,7 @@
#ifndef E_MAP_H
#define E_MAP_H
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
#define TYPE_E_MAP (e_map_get_type ())
#define E_MAP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_E_MAP, EMap))
Modified: trunk/widgets/misc/e-multi-config-dialog.c
==============================================================================
--- trunk/widgets/misc/e-multi-config-dialog.c (original)
+++ trunk/widgets/misc/e-multi-config-dialog.c Fri Jun 6 15:12:53 2008
@@ -32,8 +32,7 @@
#include <table/e-cell-vbox.h>
#include <table/e-cell-text.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-
+#include <libgnome/gnome-help.h>
#define SWITCH_PAGE_INTERVAL 250
Modified: trunk/widgets/misc/e-multi-config-dialog.h
==============================================================================
--- trunk/widgets/misc/e-multi-config-dialog.h (original)
+++ trunk/widgets/misc/e-multi-config-dialog.h Fri Jun 6 15:12:53 2008
@@ -29,8 +29,7 @@
#include "e-config-page.h"
-#include <gtk/gtkdialog.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gtk/gtk.h>
#ifdef __cplusplus
extern "C" {
Modified: trunk/widgets/misc/e-popup-menu.h
==============================================================================
--- trunk/widgets/misc/e-popup-menu.h (original)
+++ trunk/widgets/misc/e-popup-menu.h Fri Jun 6 15:12:53 2008
@@ -26,8 +26,7 @@
#ifndef E_POPUP_MENU_H
#define E_POPUP_MENU_H
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
G_BEGIN_DECLS
Modified: trunk/widgets/misc/e-printable.h
==============================================================================
--- trunk/widgets/misc/e-printable.h (original)
+++ trunk/widgets/misc/e-printable.h Fri Jun 6 15:12:53 2008
@@ -24,7 +24,6 @@
#ifndef _E_PRINTABLE_H_
#define _E_PRINTABLE_H_
-#include <gtk/gtkobject.h>
#include <gtk/gtk.h>
G_BEGIN_DECLS
Modified: trunk/widgets/misc/e-search-bar.c
==============================================================================
--- trunk/widgets/misc/e-search-bar.c (original)
+++ trunk/widgets/misc/e-search-bar.c Fri Jun 6 15:12:53 2008
@@ -30,15 +30,6 @@
#endif
#include <gdk/gdkkeysyms.h>
-#include <gtk/gtkdrawingarea.h>
-#include <gtk/gtkeventbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkoptionmenu.h>
-#include <gtk/gtkradiomenuitem.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkversion.h>
#include <misc/e-unicode.h>
#include <misc/e-gui-utils.h>
Modified: trunk/widgets/misc/e-search-bar.h
==============================================================================
--- trunk/widgets/misc/e-search-bar.h (original)
+++ trunk/widgets/misc/e-search-bar.h Fri Jun 6 15:12:53 2008
@@ -20,8 +20,7 @@
#ifndef __E_SEARCH_BAR_H__
#define __E_SEARCH_BAR_H__
-#include <gtk/gtkhbox.h>
-#include <gtk/gtktooltips.h>
+#include <gtk/gtk.h>
#include <bonobo/bonobo-ui-component.h>
Modified: trunk/widgets/misc/e-selection-model-array.h
==============================================================================
--- trunk/widgets/misc/e-selection-model-array.h (original)
+++ trunk/widgets/misc/e-selection-model-array.h Fri Jun 6 15:12:53 2008
@@ -24,7 +24,7 @@
#ifndef _E_SELECTION_MODEL_ARRAY_H_
#define _E_SELECTION_MODEL_ARRAY_H_
-#include <gtk/gtkobject.h>
+#include <glib-object.h>
#include <misc/e-selection-model.h>
#include <e-util/e-bit-array.h>
Modified: trunk/widgets/misc/e-selection-model.h
==============================================================================
--- trunk/widgets/misc/e-selection-model.h (original)
+++ trunk/widgets/misc/e-selection-model.h Fri Jun 6 15:12:53 2008
@@ -24,9 +24,8 @@
#ifndef _E_SELECTION_MODEL_H_
#define _E_SELECTION_MODEL_H_
-#include <gtk/gtkobject.h>
+#include <gtk/gtk.h>
#include <e-util/e-sorter.h>
-#include <gdk/gdkevents.h>
#ifdef __cplusplus
extern "C" {
Modified: trunk/widgets/misc/e-send-options.c
==============================================================================
--- trunk/widgets/misc/e-send-options.c (original)
+++ trunk/widgets/misc/e-send-options.c Fri Jun 6 15:12:53 2008
@@ -23,10 +23,6 @@
#endif
#include <string.h>
-#include <glib.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtk.h>
#include <libgnome/libgnome.h>
#include <glib/gi18n.h>
#include <glade/glade.h>
Modified: trunk/widgets/misc/e-send-options.h
==============================================================================
--- trunk/widgets/misc/e-send-options.h (original)
+++ trunk/widgets/misc/e-send-options.h Fri Jun 6 15:12:53 2008
@@ -22,7 +22,6 @@
#ifndef __E_SENDOPTIONS_DIALOG_H__
#define __E_SENDOPTIONS_DIALOG_H__
-#include <gtk/gtkwidget.h>
#include <gtk/gtk.h>
#include <time.h>
Modified: trunk/widgets/misc/e-spinner.c
==============================================================================
--- trunk/widgets/misc/e-spinner.c (original)
+++ trunk/widgets/misc/e-spinner.c Fri Jun 6 15:12:53 2008
@@ -36,11 +36,6 @@
#define START_PROFILER(name)
#define STOP_PROFILER(name)
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gtk/gtkicontheme.h>
-#include <gtk/gtkiconfactory.h>
-#include <gtk/gtksettings.h>
-
#include "e-util/e-icon-factory.h"
/* Spinner cache implementation */
Modified: trunk/widgets/misc/e-spinner.h
==============================================================================
--- trunk/widgets/misc/e-spinner.h (original)
+++ trunk/widgets/misc/e-spinner.h Fri Jun 6 15:12:53 2008
@@ -28,8 +28,7 @@
#ifndef E_SPINNER_H
#define E_SPINNER_H
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkenums.h>
+#include <gtk/gtk.h>
G_BEGIN_DECLS
Modified: trunk/widgets/misc/e-task-bar.c
==============================================================================
--- trunk/widgets/misc/e-task-bar.c (original)
+++ trunk/widgets/misc/e-task-bar.c Fri Jun 6 15:12:53 2008
@@ -26,10 +26,6 @@
#include "e-task-bar.h"
-#include <gtk/gtkiconfactory.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmisc.h>
-
struct _ETaskBarPrivate
{
GtkWidget *message_label;
Modified: trunk/widgets/misc/e-task-bar.h
==============================================================================
--- trunk/widgets/misc/e-task-bar.h (original)
+++ trunk/widgets/misc/e-task-bar.h Fri Jun 6 15:12:53 2008
@@ -25,7 +25,7 @@
#include "e-task-widget.h"
-#include <gtk/gtkhbox.h>
+#include <gtk/gtk.h>
#ifdef __cplusplus
extern "C" {
Modified: trunk/widgets/misc/e-task-widget.c
==============================================================================
--- trunk/widgets/misc/e-task-widget.c (original)
+++ trunk/widgets/misc/e-task-widget.c Fri Jun 6 15:12:53 2008
@@ -28,14 +28,6 @@
#include "e-spinner.h"
#include <e-util/e-icon-factory.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtktooltips.h>
-#include <gtk/gtktoolbutton.h>
-#include <gtk/gtkbox.h>
-
#include <glib/gi18n.h>
Modified: trunk/widgets/misc/e-task-widget.h
==============================================================================
--- trunk/widgets/misc/e-task-widget.h (original)
+++ trunk/widgets/misc/e-task-widget.h Fri Jun 6 15:12:53 2008
@@ -23,8 +23,7 @@
#ifndef _E_TASK_WIDGET_H_
#define _E_TASK_WIDGET_H_
-#include <gtk/gtkeventbox.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gtk/gtk.h>
#ifdef __cplusplus
extern "C" {
Modified: trunk/widgets/misc/test-calendar.c
==============================================================================
--- trunk/widgets/misc/test-calendar.c (original)
+++ trunk/widgets/misc/test-calendar.c Fri Jun 6 15:12:53 2008
@@ -29,9 +29,7 @@
#include <config.h>
#endif
-#include <gtk/gtkdnd.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
#include <libgnomeui/gnome-app.h>
#include <libgnomeui/gnome-ui-init.h>
Modified: trunk/widgets/misc/test-dateedit.c
==============================================================================
--- trunk/widgets/misc/test-dateedit.c (original)
+++ trunk/widgets/misc/test-dateedit.c Fri Jun 6 15:12:53 2008
@@ -29,11 +29,7 @@
#include <config.h>
#endif
-#include <glib.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
#include <libgnomeui/gnome-ui-init.h>
#include <libgnomeui/gnome-app.h>
#include "e-dateedit.h"
Modified: trunk/widgets/misc/test-dropdown-button.c
==============================================================================
--- trunk/widgets/misc/test-dropdown-button.c (original)
+++ trunk/widgets/misc/test-dropdown-button.c Fri Jun 6 15:12:53 2008
@@ -27,11 +27,7 @@
#endif
#include <stdio.h>
-#include <glib.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkstock.h>
+#include <gtk/gtk.h>
#include <libgnomeui/gnome-app.h>
#include <libgnomeui/gnome-app-helper.h>
Modified: trunk/widgets/misc/test-info-label.c
==============================================================================
--- trunk/widgets/misc/test-info-label.c (original)
+++ trunk/widgets/misc/test-info-label.c Fri Jun 6 15:12:53 2008
@@ -24,11 +24,7 @@
#include <config.h>
#endif
-#include <gtk/gtkbox.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtklabel.h>
-
+#include <gtk/gtk.h>
#include <libgnomeui/gnome-app.h>
#include <libgnomeui/gnome-ui-init.h>
#include <e-util/e-icon-factory.h>
Modified: trunk/widgets/misc/test-multi-config-dialog.c
==============================================================================
--- trunk/widgets/misc/test-multi-config-dialog.c (original)
+++ trunk/widgets/misc/test-multi-config-dialog.c Fri Jun 6 15:12:53 2008
@@ -23,7 +23,9 @@
#include "e-multi-config-dialog.c"
-#include <gnome.h>
+#include <gtk/gtk.h>
+#include <libgnomeui/gnome-app.h>
+#include <libgnomeui/gnome-ui-init.h>
#define NUM_PAGES 10
Modified: trunk/widgets/table/e-cell-spin-button.h
==============================================================================
--- trunk/widgets/table/e-cell-spin-button.h (original)
+++ trunk/widgets/table/e-cell-spin-button.h Fri Jun 6 15:12:53 2008
@@ -30,8 +30,7 @@
#ifndef __E_CELL_SPIN_BUTTON_H__
#define __E_CELL_SPIN_BUTTON_H__
-#include <glib.h>
-#include <gtk/gtktypeutils.h>
+#include <gtk/gtk.h>
#include <table/e-cell.h>
#define E_CELL_SPIN_BUTTON_TYPE (e_cell_spin_button_get_type ())
Modified: trunk/widgets/table/e-cell-text.h
==============================================================================
--- trunk/widgets/table/e-cell-text.h (original)
+++ trunk/widgets/table/e-cell-text.h Fri Jun 6 15:12:53 2008
@@ -36,7 +36,8 @@
#ifndef _E_CELL_TEXT_H_
#define _E_CELL_TEXT_H_
-#include <gtk/gtkmenu.h>
+
+#include <gtk/gtk.h>
#include <libgnomecanvas/gnome-canvas.h>
#include <table/e-cell.h>
Modified: trunk/widgets/table/e-cell.h
==============================================================================
--- trunk/widgets/table/e-cell.h (original)
+++ trunk/widgets/table/e-cell.h Fri Jun 6 15:12:53 2008
@@ -25,7 +25,6 @@
#ifndef _E_CELL_H_
#define _E_CELL_H_
-#include <gdk/gdktypes.h>
#include <gtk/gtk.h>
#include <table/e-table-model.h>
#include <table/e-table-tooltip.h>
Modified: trunk/widgets/table/e-table-config.h
==============================================================================
--- trunk/widgets/table/e-table-config.h (original)
+++ trunk/widgets/table/e-table-config.h Fri Jun 6 15:12:53 2008
@@ -30,7 +30,7 @@
#include <table/e-table-without.h>
#include <table/e-table-subset-variable.h>
#include <table/e-table.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
G_BEGIN_DECLS
Modified: trunk/widgets/table/e-table-field-chooser-dialog.h
==============================================================================
--- trunk/widgets/table/e-table-field-chooser-dialog.h (original)
+++ trunk/widgets/table/e-table-field-chooser-dialog.h Fri Jun 6 15:12:53 2008
@@ -24,7 +24,7 @@
#ifndef __E_TABLE_FIELD_CHOOSER_DIALOG_H__
#define __E_TABLE_FIELD_CHOOSER_DIALOG_H__
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
#include <table/e-table-field-chooser.h>
#include <table/e-table-header.h>
Modified: trunk/widgets/table/e-table-field-chooser.h
==============================================================================
--- trunk/widgets/table/e-table-field-chooser.h (original)
+++ trunk/widgets/table/e-table-field-chooser.h Fri Jun 6 15:12:53 2008
@@ -25,7 +25,7 @@
#define __E_TABLE_FIELD_CHOOSER_H__
#include <glade/glade.h>
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
#include <table/e-table-header.h>
G_BEGIN_DECLS
Modified: trunk/widgets/table/e-table-scrolled.h
==============================================================================
--- trunk/widgets/table/e-table-scrolled.h (original)
+++ trunk/widgets/table/e-table-scrolled.h Fri Jun 6 15:12:53 2008
@@ -24,7 +24,7 @@
#ifndef _E_TABLE_SCROLLED_H_
#define _E_TABLE_SCROLLED_H_
-#include <gtk/gtkscrolledwindow.h>
+#include <gtk/gtk.h>
#include <table/e-table-model.h>
#include <table/e-table.h>
Modified: trunk/widgets/table/e-table-search.h
==============================================================================
--- trunk/widgets/table/e-table-search.h (original)
+++ trunk/widgets/table/e-table-search.h Fri Jun 6 15:12:53 2008
@@ -24,7 +24,7 @@
#ifndef _E_TABLE_SEARCH_H_
#define _E_TABLE_SEARCH_H_
-#include <gtk/gtkobject.h>
+#include <glib-object.h>
G_BEGIN_DECLS
Modified: trunk/widgets/table/e-table-selection-model.h
==============================================================================
--- trunk/widgets/table/e-table-selection-model.h (original)
+++ trunk/widgets/table/e-table-selection-model.h Fri Jun 6 15:12:53 2008
@@ -24,7 +24,7 @@
#ifndef _E_TABLE_SELECTION_MODEL_H_
#define _E_TABLE_SELECTION_MODEL_H_
-#include <gtk/gtkobject.h>
+#include <glib-object.h>
#include <misc/e-selection-model-array.h>
#include <table/e-table-model.h>
#include <table/e-table-header.h>
Modified: trunk/widgets/table/e-table-without.h
==============================================================================
--- trunk/widgets/table/e-table-without.h (original)
+++ trunk/widgets/table/e-table-without.h Fri Jun 6 15:12:53 2008
@@ -24,7 +24,7 @@
#ifndef _E_TABLE_WITHOUT_H_
#define _E_TABLE_WITHOUT_H_
-#include <gtk/gtkobject.h>
+#include <glib-object.h>
#include <table/e-table-subset.h>
#ifdef __cplusplus
Modified: trunk/widgets/table/e-table.h
==============================================================================
--- trunk/widgets/table/e-table.h (original)
+++ trunk/widgets/table/e-table.h Fri Jun 6 15:12:53 2008
@@ -26,8 +26,7 @@
#define _E_TABLE_H_
#include <libgnomecanvas/gnome-canvas.h>
-#include <gtk/gtkdnd.h>
-#include <gtk/gtktable.h>
+#include <gtk/gtk.h>
#include <libxml/tree.h>
#include <table/e-table-model.h>
#include <table/e-table-header.h>
Modified: trunk/widgets/table/e-tree-scrolled.h
==============================================================================
--- trunk/widgets/table/e-tree-scrolled.h (original)
+++ trunk/widgets/table/e-tree-scrolled.h Fri Jun 6 15:12:53 2008
@@ -24,7 +24,7 @@
#ifndef _E_TREE_SCROLLED_H_
#define _E_TREE_SCROLLED_H_
-#include <gtk/gtkscrolledwindow.h>
+#include <gtk/gtk.h>
#include <table/e-tree-model.h>
#include <table/e-tree.h>
Modified: trunk/widgets/table/e-tree-selection-model.h
==============================================================================
--- trunk/widgets/table/e-tree-selection-model.h (original)
+++ trunk/widgets/table/e-tree-selection-model.h Fri Jun 6 15:12:53 2008
@@ -24,8 +24,7 @@
#ifndef _E_TREE_SELECTION_MODEL_H_
#define _E_TREE_SELECTION_MODEL_H_
-#include <gdk/gdktypes.h>
-#include <gtk/gtkobject.h>
+#include <glib-object.h>
#include <e-util/e-sorter.h>
#include <misc/e-selection-model.h>
#include <table/e-tree-model.h>
Modified: trunk/widgets/table/e-tree.h
==============================================================================
--- trunk/widgets/table/e-tree.h (original)
+++ trunk/widgets/table/e-tree.h Fri Jun 6 15:12:53 2008
@@ -24,8 +24,7 @@
#ifndef _E_TREE_H_
#define _E_TREE_H_
-#include <gtk/gtkdnd.h>
-#include <gtk/gtktable.h>
+#include <gtk/gtk.h>
#include <libxml/tree.h>
#include <libgnomecanvas/gnome-canvas.h>
#include <misc/e-printable.h>
Modified: trunk/widgets/text/e-text-model.h
==============================================================================
--- trunk/widgets/text/e-text-model.h (original)
+++ trunk/widgets/text/e-text-model.h Fri Jun 6 15:12:53 2008
@@ -24,8 +24,7 @@
#ifndef E_TEXT_MODEL_H
#define E_TEXT_MODEL_H
-#include <glib.h>
-#include <gtk/gtkobject.h>
+#include <glib-object.h>
G_BEGIN_DECLS
Modified: trunk/widgets/text/e-text.h
==============================================================================
--- trunk/widgets/text/e-text.h (original)
+++ trunk/widgets/text/e-text.h Fri Jun 6 15:12:53 2008
@@ -37,7 +37,7 @@
#ifndef E_TEXT_H
#define E_TEXT_H
-#include <gtk/gtkmenu.h>
+#include <gtk/gtk.h>
#include <e-util/e-text-event-processor.h>
#include <text/e-text-model.h>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
