projects
/
modest
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9f7d76b
)
Use GTK+ single includes
author
Javier Jardón
<javierjc1982@gmail.com>
Fri, 7 Aug 2009 16:48:05 +0000
(18:48 +0200)
committer
Sergio Villar Senin
<svillar@igalia.com>
Wed, 30 Sep 2009 10:14:38 +0000
(12:14 +0200)
Only modified the files needed by the Gnome version of modest
53 files changed:
src/gnome/modest-default-account-settings-dialog.c
patch
|
blob
|
history
src/gnome/modest-gnome-global-settings-dialog.c
patch
|
blob
|
history
src/gnome/modest-gnome-sort-dialog.c
patch
|
blob
|
history
src/gnome/modest-gnome-sort-dialog.h
patch
|
blob
|
history
src/gnome/modest-main-window.c
patch
|
blob
|
history
src/gnome/modest-store-widget.h
patch
|
blob
|
history
src/gnome/modest-transport-widget.h
patch
|
blob
|
history
src/modest-address-book.h
patch
|
blob
|
history
src/modest-plugin-ui-actions.h
patch
|
blob
|
history
src/modest-text-utils.h
patch
|
blob
|
history
src/modest-tny-account-store.h
patch
|
blob
|
history
src/widgets/modest-account-view.c
patch
|
blob
|
history
src/widgets/modest-account-view.h
patch
|
blob
|
history
src/widgets/modest-combo-box.c
patch
|
blob
|
history
src/widgets/modest-combo-box.h
patch
|
blob
|
history
src/widgets/modest-default-account-settings-dialog.h
patch
|
blob
|
history
src/widgets/modest-details-dialog.c
patch
|
blob
|
history
src/widgets/modest-details-dialog.h
patch
|
blob
|
history
src/widgets/modest-dnd.c
patch
|
blob
|
history
src/widgets/modest-dnd.h
patch
|
blob
|
history
src/widgets/modest-global-settings-dialog-priv.h
patch
|
blob
|
history
src/widgets/modest-global-settings-dialog.c
patch
|
blob
|
history
src/widgets/modest-global-settings-dialog.h
patch
|
blob
|
history
src/widgets/modest-hbox-cell-renderer.c
patch
|
blob
|
history
src/widgets/modest-hbox-cell-renderer.h
patch
|
blob
|
history
src/widgets/modest-header-view-priv.h
patch
|
blob
|
history
src/widgets/modest-limit-retrieve-combo-box.c
patch
|
blob
|
history
src/widgets/modest-limit-retrieve-combo-box.h
patch
|
blob
|
history
src/widgets/modest-mail-header-view.h
patch
|
blob
|
history
src/widgets/modest-main-window.h
patch
|
blob
|
history
src/widgets/modest-msg-view-window.h
patch
|
blob
|
history
src/widgets/modest-progress-bar.h
patch
|
blob
|
history
src/widgets/modest-recpt-editor.c
patch
|
blob
|
history
src/widgets/modest-recpt-editor.h
patch
|
blob
|
history
src/widgets/modest-recpt-view.c
patch
|
blob
|
history
src/widgets/modest-retrieve-combo-box.c
patch
|
blob
|
history
src/widgets/modest-retrieve-combo-box.h
patch
|
blob
|
history
src/widgets/modest-scroll-area.c
patch
|
blob
|
history
src/widgets/modest-scroll-text.c
patch
|
blob
|
history
src/widgets/modest-scroll-text.h
patch
|
blob
|
history
src/widgets/modest-secureauth-combo-box.c
patch
|
blob
|
history
src/widgets/modest-secureauth-combo-box.h
patch
|
blob
|
history
src/widgets/modest-security-options-view.c
patch
|
blob
|
history
src/widgets/modest-serversecurity-combo-box.c
patch
|
blob
|
history
src/widgets/modest-serversecurity-combo-box.h
patch
|
blob
|
history
src/widgets/modest-sort-criterium-view.h
patch
|
blob
|
history
src/widgets/modest-validating-entry.h
patch
|
blob
|
history
src/widgets/modest-vbox-cell-renderer.c
patch
|
blob
|
history
src/widgets/modest-vbox-cell-renderer.h
patch
|
blob
|
history
src/widgets/modest-window-priv.h
patch
|
blob
|
history
src/widgets/modest-window.h
patch
|
blob
|
history
src/widgets/modest-wizard-dialog.c
patch
|
blob
|
history
src/widgets/modest-wizard-dialog.h
patch
|
blob
|
history
diff --git
a/src/gnome/modest-default-account-settings-dialog.c
b/src/gnome/modest-default-account-settings-dialog.c
index
0295822
..
fabc986
100644
(file)
--- a/
src/gnome/modest-default-account-settings-dialog.c
+++ b/
src/gnome/modest-default-account-settings-dialog.c
@@
-30,15
+30,7
@@
#include "widgets/modest-account-settings-dialog.h"
#include <glib/gi18n.h>
#include "widgets/modest-account-settings-dialog.h"
#include <glib/gi18n.h>
-#include <gtk/gtknotebook.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkcombobox.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtkmessagedialog.h>
-#include <gtk/gtkstock.h>
+#include <gtk/gtk.h>
#include "widgets/modest-serversecurity-combo-box.h"
#include "widgets/modest-secureauth-combo-box.h"
#include "widgets/modest-serversecurity-combo-box.h"
#include "widgets/modest-secureauth-combo-box.h"
diff --git
a/src/gnome/modest-gnome-global-settings-dialog.c
b/src/gnome/modest-gnome-global-settings-dialog.c
index
c4e88c1
..
3923039
100644
(file)
--- a/
src/gnome/modest-gnome-global-settings-dialog.c
+++ b/
src/gnome/modest-gnome-global-settings-dialog.c
@@
-32,13
+32,7
@@
#endif /*HAVE_CONFIG_H*/
#include <glib/gi18n.h>
#endif /*HAVE_CONFIG_H*/
#include <glib/gi18n.h>
-#include <gtk/gtkbox.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtkhseparator.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkspinbutton.h>
+#include <gtk/gtk.h>
#include "widgets/modest-global-settings-dialog-priv.h"
#include "widgets/modest-combo-box.h"
#include "modest-runtime.h"
#include "widgets/modest-global-settings-dialog-priv.h"
#include "widgets/modest-combo-box.h"
#include "modest-runtime.h"
diff --git
a/src/gnome/modest-gnome-sort-dialog.c
b/src/gnome/modest-gnome-sort-dialog.c
index
b1b4864
..
302c09f
100644
(file)
--- a/
src/gnome/modest-gnome-sort-dialog.c
+++ b/
src/gnome/modest-gnome-sort-dialog.c
@@
-30,10
+30,7
@@
#include <glib/gi18n.h>
#include "modest-gnome-sort-dialog.h"
#include "widgets/modest-sort-criterium-view.h"
#include <glib/gi18n.h>
#include "modest-gnome-sort-dialog.h"
#include "widgets/modest-sort-criterium-view.h"
-#include <gtk/gtkstock.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkcombobox.h>
-
+#include <gtk/gtk.h>
static gint modest_gnome_sort_dialog_add_sort_key (ModestSortCriteriumView *self,
const gchar *sort_key);
static gint modest_gnome_sort_dialog_add_sort_key (ModestSortCriteriumView *self,
const gchar *sort_key);
diff --git
a/src/gnome/modest-gnome-sort-dialog.h
b/src/gnome/modest-gnome-sort-dialog.h
index
fc6caf0
..
d63a939
100644
(file)
--- a/
src/gnome/modest-gnome-sort-dialog.h
+++ b/
src/gnome/modest-gnome-sort-dialog.h
@@
-31,7
+31,7
@@
#define __MODEST_GNOME_SORT_DIALOG
#include <glib.h>
#define __MODEST_GNOME_SORT_DIALOG
#include <glib.h>
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
#include <widgets/modest-sort-criterium-view.h>
G_BEGIN_DECLS
#include <widgets/modest-sort-criterium-view.h>
G_BEGIN_DECLS
diff --git
a/src/gnome/modest-main-window.c
b/src/gnome/modest-main-window.c
index
16510e7
..
ef483e6
100644
(file)
--- a/
src/gnome/modest-main-window.c
+++ b/
src/gnome/modest-main-window.c
@@
-28,7
+28,7
@@
*/
#include <glib/gi18n.h>
*/
#include <glib/gi18n.h>
-#include <gtk/gtktreeviewcolumn.h>
+#include <gtk/gtk.h>
#include <tny-account-store-view.h>
#include <tny-simple-list.h>
#include <tny-error.h>
#include <tny-account-store-view.h>
#include <tny-simple-list.h>
#include <tny-error.h>
diff --git
a/src/gnome/modest-store-widget.h
b/src/gnome/modest-store-widget.h
index
3c86f4b
..
6a72e29
100644
(file)
--- a/
src/gnome/modest-store-widget.h
+++ b/
src/gnome/modest-store-widget.h
@@
-30,7
+30,7
@@
#ifndef __MODEST_STORE_WIDGET_H__
#define __MODEST_STORE_WIDGET_H__
#ifndef __MODEST_STORE_WIDGET_H__
#define __MODEST_STORE_WIDGET_H__
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
#include "modest-protocol.h"
G_BEGIN_DECLS
#include "modest-protocol.h"
G_BEGIN_DECLS
diff --git
a/src/gnome/modest-transport-widget.h
b/src/gnome/modest-transport-widget.h
index
4e94973
..
3c2e976
100644
(file)
--- a/
src/gnome/modest-transport-widget.h
+++ b/
src/gnome/modest-transport-widget.h
@@
-32,7
+32,7
@@
G_BEGIN_DECLS
G_BEGIN_DECLS
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
#include "modest-protocol-registry.h"
/* convenience macros */
#include "modest-protocol-registry.h"
/* convenience macros */
diff --git
a/src/modest-address-book.h
b/src/modest-address-book.h
index
f0d5690
..
2665404
100644
(file)
--- a/
src/modest-address-book.h
+++ b/
src/modest-address-book.h
@@
-32,7
+32,7
@@
#ifndef __MODEST_ADDRESS_BOOK_H__
#define __MODEST_ADDRESS_BOOK_H__
#ifndef __MODEST_ADDRESS_BOOK_H__
#define __MODEST_ADDRESS_BOOK_H__
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
#include <glib.h>
#include <widgets/modest-recpt-editor.h>
#include <glib.h>
#include <widgets/modest-recpt-editor.h>
diff --git
a/src/modest-plugin-ui-actions.h
b/src/modest-plugin-ui-actions.h
index
b17b320
..
301a047
100644
(file)
--- a/
src/modest-plugin-ui-actions.h
+++ b/
src/modest-plugin-ui-actions.h
@@
-34,7
+34,7
@@
* that should be available in plugins.
*/
* that should be available in plugins.
*/
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
#include <glib.h>
G_BEGIN_DECLS
#include <glib.h>
G_BEGIN_DECLS
diff --git
a/src/modest-text-utils.h
b/src/modest-text-utils.h
index
7415003
..
b0c9d85
100644
(file)
--- a/
src/modest-text-utils.h
+++ b/
src/modest-text-utils.h
@@
-35,9
+35,8
@@
#include <time.h>
#include <glib.h>
#include <time.h>
#include <glib.h>
-#include <gdk/gdkcolor.h>
-#include <gtk/gtktextbuffer.h>
-#include <gtk/gtklabel.h>
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
#define _FM(str) dgettext("hildon-fm",str)
#define _CS(str) dgettext("hildon-common-strings",str)
#define _FM(str) dgettext("hildon-fm",str)
#define _CS(str) dgettext("hildon-common-strings",str)
diff --git
a/src/modest-tny-account-store.h
b/src/modest-tny-account-store.h
index
ac865c0
..
9b64db1
100644
(file)
--- a/
src/modest-tny-account-store.h
+++ b/
src/modest-tny-account-store.h
@@
-34,13
+34,13
@@
#define __MODEST_TNY_ACCOUNT_STORE_H__
#include <glib-object.h>
#define __MODEST_TNY_ACCOUNT_STORE_H__
#include <glib-object.h>
+#include <gtk/gtk.h>
#include <tny-account-store.h>
#include <tny-session-camel.h>
#include <tny-shared.h>
#include <tny-folder.h>
#include <modest-account-mgr.h>
#include <modest-tny-local-folders-account.h>
#include <tny-account-store.h>
#include <tny-session-camel.h>
#include <tny-shared.h>
#include <tny-folder.h>
#include <modest-account-mgr.h>
#include <modest-tny-local-folders-account.h>
-#include <gtk/gtkwidget.h>
/* other include files */
/* other include files */
diff --git
a/src/widgets/modest-account-view.c
b/src/widgets/modest-account-view.c
index
3544f54
..
abfce39
100644
(file)
--- a/
src/widgets/modest-account-view.c
+++ b/
src/widgets/modest-account-view.c
@@
-28,6
+28,7
@@
*/
#include <glib/gi18n.h>
*/
#include <glib/gi18n.h>
+#include <gtk/gtk.h>
#include "modest-account-view.h"
#include <modest-account-mgr.h>
#include "modest-account-view.h"
#include <modest-account-mgr.h>
@@
-37,10
+38,6
@@
#include <modest-runtime.h>
#include <modest-signal-mgr.h>
#include <modest-runtime.h>
#include <modest-signal-mgr.h>
-#include <gtk/gtkcellrenderertoggle.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtkliststore.h>
#include <string.h> /* For strcmp(). */
#include <modest-account-mgr-helpers.h>
#include <modest-datetime-formatter.h>
#include <string.h> /* For strcmp(). */
#include <modest-account-mgr-helpers.h>
#include <modest-datetime-formatter.h>
diff --git
a/src/widgets/modest-account-view.h
b/src/widgets/modest-account-view.h
index
31a7674
..
cfbbe1d
100644
(file)
--- a/
src/widgets/modest-account-view.h
+++ b/
src/widgets/modest-account-view.h
@@
-31,7
+31,7
@@
#define __MODEST_ACCOUNT_VIEW_H__
#include "modest-account-mgr.h"
#define __MODEST_ACCOUNT_VIEW_H__
#include "modest-account-mgr.h"
-#include <gtk/gtktreeview.h>
+#include <gtk/gtk.h>
G_BEGIN_DECLS
G_BEGIN_DECLS
diff --git
a/src/widgets/modest-combo-box.c
b/src/widgets/modest-combo-box.c
index
6c066fe
..
810e02f
100644
(file)
--- a/
src/widgets/modest-combo-box.c
+++ b/
src/widgets/modest-combo-box.c
@@
-27,9
+27,7
@@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <gtk/gtkcelllayout.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkliststore.h>
+#include <gtk/gtk.h>
#include "modest-combo-box.h"
/* 'private'/'protected' functions */
#include "modest-combo-box.h"
/* 'private'/'protected' functions */
diff --git
a/src/widgets/modest-combo-box.h
b/src/widgets/modest-combo-box.h
index
060266c
..
ee43edb
100644
(file)
--- a/
src/widgets/modest-combo-box.h
+++ b/
src/widgets/modest-combo-box.h
@@
-30,7
+30,7
@@
#ifndef __MODEST_COMBO_BOX_H__
#define __MODEST_COMBO_BOX_H__
#ifndef __MODEST_COMBO_BOX_H__
#define __MODEST_COMBO_BOX_H__
-#include <gtk/gtkcombobox.h>
+#include <gtk/gtk.h>
#include <modest-pair.h>
G_BEGIN_DECLS
#include <modest-pair.h>
G_BEGIN_DECLS
diff --git
a/src/widgets/modest-default-account-settings-dialog.h
b/src/widgets/modest-default-account-settings-dialog.h
index
331e3de
..
f636410
100644
(file)
--- a/
src/widgets/modest-default-account-settings-dialog.h
+++ b/
src/widgets/modest-default-account-settings-dialog.h
@@
-30,8
+30,7
@@
#ifndef _MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG
#define _MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG
#ifndef _MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG
#define _MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG
-#include <gtk/gtkdialog.h>
-#include <gtk/gtknotebook.h>
+#include <gtk/gtk.h>
#include "widgets/modest-account-settings-dialog.h"
#include <modest-protocol.h>
#include "widgets/modest-account-settings-dialog.h"
#include <modest-protocol.h>
diff --git
a/src/widgets/modest-details-dialog.c
b/src/widgets/modest-details-dialog.c
index
30757c2
..
5d2eddc
100644
(file)
--- a/
src/widgets/modest-details-dialog.c
+++ b/
src/widgets/modest-details-dialog.c
@@
-31,10
+31,7
@@
#include <glib/gi18n.h>
#include <gdk/gdkkeysyms.h>
#include <glib/gi18n.h>
#include <gdk/gdkkeysyms.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtklabel.h>
+#include <gtk/gtk.h>
#include <tny-msg.h>
#include <tny-header.h>
#include <tny-header-view.h>
#include <tny-msg.h>
#include <tny-header.h>
#include <tny-header-view.h>
diff --git
a/src/widgets/modest-details-dialog.h
b/src/widgets/modest-details-dialog.h
index
0814257
..
065c034
100644
(file)
--- a/
src/widgets/modest-details-dialog.h
+++ b/
src/widgets/modest-details-dialog.h
@@
-31,7
+31,7
@@
#define __MODEST_DETAILS_DIALOG
#include <glib.h>
#define __MODEST_DETAILS_DIALOG
#include <glib.h>
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
#include <tny-header.h>
#include <tny-header.h>
diff --git
a/src/widgets/modest-dnd.c
b/src/widgets/modest-dnd.c
index
6c40d8b
..
557cb42
100644
(file)
--- a/
src/widgets/modest-dnd.c
+++ b/
src/widgets/modest-dnd.c
@@
-28,7
+28,7
@@
*/
#include "modest-dnd.h"
*/
#include "modest-dnd.h"
-#include <gtk/gtktreeview.h>
+#include <gtk/gtk.h>
#include <string.h>
GdkAtom tree_path_as_string_list_atom;
#include <string.h>
GdkAtom tree_path_as_string_list_atom;
diff --git
a/src/widgets/modest-dnd.h
b/src/widgets/modest-dnd.h
index
1a7a714
..
01ace42
100644
(file)
--- a/
src/widgets/modest-dnd.h
+++ b/
src/widgets/modest-dnd.h
@@
-31,7
+31,7
@@
#define __MODEST_DND_H__
#include <gdk/gdk.h>
#define __MODEST_DND_H__
#include <gdk/gdk.h>
-#include <gtk/gtkselection.h>
+#include <gtk/gtk.h>
extern GdkAtom tree_path_as_string_list_atom;
extern GdkAtom tree_path_as_string_list_atom;
diff --git
a/src/widgets/modest-global-settings-dialog-priv.h
b/src/widgets/modest-global-settings-dialog-priv.h
index
b1f055d
..
c55472d
100644
(file)
--- a/
src/widgets/modest-global-settings-dialog-priv.h
+++ b/
src/widgets/modest-global-settings-dialog-priv.h
@@
-30,7
+30,7
@@
#ifndef __MODEST_GLOBAL_SETTINGS_DIALOG_PRIV_H__
#define __MODEST_GLOBAL_SETTINGS_DIALOG_PRIV_H__
#ifndef __MODEST_GLOBAL_SETTINGS_DIALOG_PRIV_H__
#define __MODEST_GLOBAL_SETTINGS_DIALOG_PRIV_H__
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
#include "modest-pair.h"
G_BEGIN_DECLS
#include "modest-pair.h"
G_BEGIN_DECLS
diff --git
a/src/widgets/modest-global-settings-dialog.c
b/src/widgets/modest-global-settings-dialog.c
index
2adbe1b
..
043c7c6
100644
(file)
--- a/
src/widgets/modest-global-settings-dialog.c
+++ b/
src/widgets/modest-global-settings-dialog.c
@@
-28,10
+28,7
@@
*/
#include <glib/gi18n.h>
*/
#include <glib/gi18n.h>
-#include <gtk/gtknotebook.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtktogglebutton.h>
+#include <gtk/gtk.h>
#include <string.h>
#include "widgets/modest-global-settings-dialog.h"
#include "widgets/modest-global-settings-dialog-priv.h"
#include <string.h>
#include "widgets/modest-global-settings-dialog.h"
#include "widgets/modest-global-settings-dialog-priv.h"
diff --git
a/src/widgets/modest-global-settings-dialog.h
b/src/widgets/modest-global-settings-dialog.h
index
bc4b768
..
25a787f
100644
(file)
--- a/
src/widgets/modest-global-settings-dialog.h
+++ b/
src/widgets/modest-global-settings-dialog.h
@@
-33,7
+33,7
@@
#ifdef MODEST_TOOLKIT_HILDON2
#include <hildon/hildon-dialog.h>
#else
#ifdef MODEST_TOOLKIT_HILDON2
#include <hildon/hildon-dialog.h>
#else
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
#endif
#include "widgets/modest-global-settings-dialog-priv.h"
#include "modest-platform.h"
#endif
#include "widgets/modest-global-settings-dialog-priv.h"
#include "modest-platform.h"
diff --git
a/src/widgets/modest-hbox-cell-renderer.c
b/src/widgets/modest-hbox-cell-renderer.c
index
568ea8e
..
5903f13
100644
(file)
--- a/
src/widgets/modest-hbox-cell-renderer.c
+++ b/
src/widgets/modest-hbox-cell-renderer.c
@@
-30,7
+30,7
@@
#include <config.h>
#include <glib/gi18n-lib.h>
#include <config.h>
#include <glib/gi18n-lib.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
#include <modest-text-utils.h>
#include <modest-hbox-cell-renderer.h>
#include <modest-text-utils.h>
#include <modest-hbox-cell-renderer.h>
diff --git
a/src/widgets/modest-hbox-cell-renderer.h
b/src/widgets/modest-hbox-cell-renderer.h
index
dba7aca
..
130d4b6
100644
(file)
--- a/
src/widgets/modest-hbox-cell-renderer.h
+++ b/
src/widgets/modest-hbox-cell-renderer.h
@@
-30,7
+30,7
@@
#ifndef MODEST_HBOX_CELL_RENDERER_H
#define MODEST_HBOX_CELL_RENDERER_H
#include <glib-object.h>
#ifndef MODEST_HBOX_CELL_RENDERER_H
#define MODEST_HBOX_CELL_RENDERER_H
#include <glib-object.h>
-#include <gtk/gtkcellrenderer.h>
+#include <gtk/gtk.h>
G_BEGIN_DECLS
G_BEGIN_DECLS
diff --git
a/src/widgets/modest-header-view-priv.h
b/src/widgets/modest-header-view-priv.h
index
445571f
..
508488c
100644
(file)
--- a/
src/widgets/modest-header-view-priv.h
+++ b/
src/widgets/modest-header-view-priv.h
@@
-30,7
+30,7
@@
#ifndef __MODEST_HEADER_VIEW_PRIV_H__
#define __MODEST_HEADER_VIEW_PRIV_H__
#ifndef __MODEST_HEADER_VIEW_PRIV_H__
#define __MODEST_HEADER_VIEW_PRIV_H__
-#include <gtk/gtktreeview.h>
+#include <gtk/gtk.h>
#include "modest-header-view.h"
G_BEGIN_DECLS
#include "modest-header-view.h"
G_BEGIN_DECLS
diff --git
a/src/widgets/modest-limit-retrieve-combo-box.c
b/src/widgets/modest-limit-retrieve-combo-box.c
index
022e2dc
..
a2e70b9
100644
(file)
--- a/
src/widgets/modest-limit-retrieve-combo-box.c
+++ b/
src/widgets/modest-limit-retrieve-combo-box.c
@@
-29,9
+29,7
@@
*/
#include "modest-limit-retrieve-combo-box.h"
*/
#include "modest-limit-retrieve-combo-box.h"
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkcelllayout.h>
-#include <gtk/gtkcellrenderertext.h>
+#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <stdlib.h>
#include <glib/gi18n.h>
#include <stdlib.h>
diff --git
a/src/widgets/modest-limit-retrieve-combo-box.h
b/src/widgets/modest-limit-retrieve-combo-box.h
index
7c48aa8
..
5d71241
100644
(file)
--- a/
src/widgets/modest-limit-retrieve-combo-box.h
+++ b/
src/widgets/modest-limit-retrieve-combo-box.h
@@
-31,7
+31,7
@@
#ifndef _MODEST_LIMIT_RETRIEVE_COMBO_BOX
#define _MODEST_LIMIT_RETRIEVE_COMBO_BOX
#ifndef _MODEST_LIMIT_RETRIEVE_COMBO_BOX
#define _MODEST_LIMIT_RETRIEVE_COMBO_BOX
-#include <gtk/gtkcombobox.h>
+#include <gtk/gtk.h>
G_BEGIN_DECLS
G_BEGIN_DECLS
diff --git
a/src/widgets/modest-mail-header-view.h
b/src/widgets/modest-mail-header-view.h
index
992a180
..
975fe09
100644
(file)
--- a/
src/widgets/modest-mail-header-view.h
+++ b/
src/widgets/modest-mail-header-view.h
@@
-31,7
+31,7
@@
#define __MODEST_MAIL_HEADER_VIEW_H__
#include <tny-header-view.h>
#define __MODEST_MAIL_HEADER_VIEW_H__
#include <tny-header-view.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
G_BEGIN_DECLS
G_BEGIN_DECLS
diff --git
a/src/widgets/modest-main-window.h
b/src/widgets/modest-main-window.h
index
de2a0aa
..
a9f9476
100644
(file)
--- a/
src/widgets/modest-main-window.h
+++ b/
src/widgets/modest-main-window.h
@@
-31,7
+31,7
@@
#ifndef __MODEST_MAIN_WINDOW_H__
#define __MODEST_MAIN_WINDOW_H__
#ifndef __MODEST_MAIN_WINDOW_H__
#define __MODEST_MAIN_WINDOW_H__
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
#include <widgets/modest-window.h>
#include <widgets/modest-header-view.h>
#include <widgets/modest-folder-view.h>
#include <widgets/modest-window.h>
#include <widgets/modest-header-view.h>
#include <widgets/modest-folder-view.h>
diff --git
a/src/widgets/modest-msg-view-window.h
b/src/widgets/modest-msg-view-window.h
index
bad28f4
..
8f3efd5
100644
(file)
--- a/
src/widgets/modest-msg-view-window.h
+++ b/
src/widgets/modest-msg-view-window.h
@@
-37,8
+37,7
@@
#endif
#include <widgets/modest-window.h>
#include <widgets/modest-header-view.h>
#endif
#include <widgets/modest-window.h>
#include <widgets/modest-header-view.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtkenums.h>
+#include <gtk/gtk.h>
G_BEGIN_DECLS
G_BEGIN_DECLS
diff --git
a/src/widgets/modest-progress-bar.h
b/src/widgets/modest-progress-bar.h
index
0bf5ad6
..
23e878a
100644
(file)
--- a/
src/widgets/modest-progress-bar.h
+++ b/
src/widgets/modest-progress-bar.h
@@
-30,7
+30,7
@@
#ifndef __MODEST_PROGRESS_BAR_H__
#define __MODEST_PROGRESS_BAR_H__
#ifndef __MODEST_PROGRESS_BAR_H__
#define __MODEST_PROGRESS_BAR_H__
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
#include "modest-progress-object.h"
G_BEGIN_DECLS
#include "modest-progress-object.h"
G_BEGIN_DECLS
diff --git
a/src/widgets/modest-recpt-editor.c
b/src/widgets/modest-recpt-editor.c
index
706e96f
..
6037821
100644
(file)
--- a/
src/widgets/modest-recpt-editor.c
+++ b/
src/widgets/modest-recpt-editor.c
@@
-31,10
+31,7
@@
#include <glib/gi18n-lib.h>
#include <glib/gi18n-lib.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtktextview.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkbutton.h>
+#include <gtk/gtk.h>
#include <modest-text-utils.h>
#include <modest-recpt-editor.h>
#include <modest-text-utils.h>
#include <modest-recpt-editor.h>
diff --git
a/src/widgets/modest-recpt-editor.h
b/src/widgets/modest-recpt-editor.h
index
f608899
..
c2f353e
100644
(file)
--- a/
src/widgets/modest-recpt-editor.h
+++ b/
src/widgets/modest-recpt-editor.h
@@
-30,9
+30,7
@@
#ifndef MODEST_RECPT_EDITOR_H
#define MODEST_RECPT_EDITOR_H
#include <glib-object.h>
#ifndef MODEST_RECPT_EDITOR_H
#define MODEST_RECPT_EDITOR_H
#include <glib-object.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtksizegroup.h>
-#include <gtk/gtktextbuffer.h>
+#include <gtk/gtk.h>
G_BEGIN_DECLS
G_BEGIN_DECLS
diff --git
a/src/widgets/modest-recpt-view.c
b/src/widgets/modest-recpt-view.c
index
ba19dbe
..
847510f
100644
(file)
--- a/
src/widgets/modest-recpt-view.c
+++ b/
src/widgets/modest-recpt-view.c
@@
-31,7
+31,7
@@
#include <glib/gi18n-lib.h>
#include <glib/gi18n-lib.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
#include <modest-text-utils.h>
#include <modest-recpt-view.h>
#include <modest-text-utils.h>
#include <modest-recpt-view.h>
diff --git
a/src/widgets/modest-retrieve-combo-box.c
b/src/widgets/modest-retrieve-combo-box.c
index
fae5a60
..
05b1e6f
100644
(file)
--- a/
src/widgets/modest-retrieve-combo-box.c
+++ b/
src/widgets/modest-retrieve-combo-box.c
@@
-31,9
+31,7
@@
#include "modest-retrieve-combo-box.h"
#include "modest-defs.h" /* For the conf names. */
#include "modest-account-settings.h"
#include "modest-retrieve-combo-box.h"
#include "modest-defs.h" /* For the conf names. */
#include "modest-account-settings.h"
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkcelllayout.h>
-#include <gtk/gtkcellrenderertext.h>
+#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <stdlib.h>
#include <glib/gi18n.h>
#include <stdlib.h>
diff --git
a/src/widgets/modest-retrieve-combo-box.h
b/src/widgets/modest-retrieve-combo-box.h
index
8ef9153
..
ef50b8b
100644
(file)
--- a/
src/widgets/modest-retrieve-combo-box.h
+++ b/
src/widgets/modest-retrieve-combo-box.h
@@
-31,7
+31,7
@@
#ifndef _MODEST_RETRIEVE_COMBO_BOX
#define _MODEST_RETRIEVE_COMBO_BOX
#ifndef _MODEST_RETRIEVE_COMBO_BOX
#define _MODEST_RETRIEVE_COMBO_BOX
-#include <gtk/gtkcombobox.h>
+#include <gtk/gtk.h>
#include "modest-protocol-registry.h"
#include <modest-account-settings.h>
#include "modest-protocol-registry.h"
#include <modest-account-settings.h>
diff --git
a/src/widgets/modest-scroll-area.c
b/src/widgets/modest-scroll-area.c
index
90bfb20
..
bd1f7ad
100644
(file)
--- a/
src/widgets/modest-scroll-area.c
+++ b/
src/widgets/modest-scroll-area.c
@@
-40,10
+40,7
@@
*/
#include "modest-scroll-area.h"
*/
#include "modest-scroll-area.h"
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkfixed.h>
-#include <gtk/gtkadjustment.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
#include <string.h>
typedef struct
#include <string.h>
typedef struct
diff --git
a/src/widgets/modest-scroll-text.c
b/src/widgets/modest-scroll-text.c
index
200cdb9
..
c5b33ae
100644
(file)
--- a/
src/widgets/modest-scroll-text.c
+++ b/
src/widgets/modest-scroll-text.c
@@
-31,7
+31,7
@@
#include <glib/gi18n-lib.h>
#include <glib/gi18n-lib.h>
-#include <gtk/gtktextview.h>
+#include <gtk/gtk.h>
#include <modest-scroll-text.h>
#include <modest-scroll-text.h>
diff --git
a/src/widgets/modest-scroll-text.h
b/src/widgets/modest-scroll-text.h
index
988c26c
..
dcdaf2e
100644
(file)
--- a/
src/widgets/modest-scroll-text.h
+++ b/
src/widgets/modest-scroll-text.h
@@
-29,8
+29,7
@@
#ifndef MODEST_SCROLL_TEXT_H
#define MODEST_SCROLL_TEXT_H
#ifndef MODEST_SCROLL_TEXT_H
#define MODEST_SCROLL_TEXT_H
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtktextview.h>
+#include <gtk/gtk.h>
#include <glib-object.h>
G_BEGIN_DECLS
#include <glib-object.h>
G_BEGIN_DECLS
diff --git
a/src/widgets/modest-secureauth-combo-box.c
b/src/widgets/modest-secureauth-combo-box.c
index
c2e67e4
..
ac29a89
100644
(file)
--- a/
src/widgets/modest-secureauth-combo-box.c
+++ b/
src/widgets/modest-secureauth-combo-box.c
@@
-30,9
+30,7
@@
#include "modest-secureauth-combo-box.h"
#include <modest-runtime.h>
#include "modest-secureauth-combo-box.h"
#include <modest-runtime.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkcelllayout.h>
-#include <gtk/gtkcellrenderertext.h>
+#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <stdlib.h>
#include <glib/gi18n.h>
#include <stdlib.h>
diff --git
a/src/widgets/modest-secureauth-combo-box.h
b/src/widgets/modest-secureauth-combo-box.h
index
4673c34
..
854ff7a
100644
(file)
--- a/
src/widgets/modest-secureauth-combo-box.h
+++ b/
src/widgets/modest-secureauth-combo-box.h
@@
-31,7
+31,7
@@
#ifndef _MODEST_SECUREAUTH_COMBO_BOX
#define _MODEST_SECUREAUTH_COMBO_BOX
#ifndef _MODEST_SECUREAUTH_COMBO_BOX
#define _MODEST_SECUREAUTH_COMBO_BOX
-#include <gtk/gtkcombobox.h>
+#include <gtk/gtk.h>
#include "modest-protocol-registry.h"
G_BEGIN_DECLS
#include "modest-protocol-registry.h"
G_BEGIN_DECLS
diff --git
a/src/widgets/modest-security-options-view.c
b/src/widgets/modest-security-options-view.c
index
9f88f09
..
c7552f6
100644
(file)
--- a/
src/widgets/modest-security-options-view.c
+++ b/
src/widgets/modest-security-options-view.c
@@
-28,7
+28,7
@@
*/
#include <string.h>
*/
#include <string.h>
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
#include "modest-utils.h"
#include "modest-runtime.h"
#include "modest-platform.h"
#include "modest-utils.h"
#include "modest-runtime.h"
#include "modest-platform.h"
diff --git
a/src/widgets/modest-serversecurity-combo-box.c
b/src/widgets/modest-serversecurity-combo-box.c
index
856e80a
..
8443e0d
100644
(file)
--- a/
src/widgets/modest-serversecurity-combo-box.c
+++ b/
src/widgets/modest-serversecurity-combo-box.c
@@
-31,9
+31,7
@@
#include "modest-serversecurity-combo-box.h"
#include <modest-runtime.h>
#include <modest-account-protocol.h>
#include "modest-serversecurity-combo-box.h"
#include <modest-runtime.h>
#include <modest-account-protocol.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkcelllayout.h>
-#include <gtk/gtkcellrenderertext.h>
+#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <stdlib.h>
#include <glib/gi18n.h>
#include <stdlib.h>
diff --git
a/src/widgets/modest-serversecurity-combo-box.h
b/src/widgets/modest-serversecurity-combo-box.h
index
779e3e7
..
4693a90
100644
(file)
--- a/
src/widgets/modest-serversecurity-combo-box.h
+++ b/
src/widgets/modest-serversecurity-combo-box.h
@@
-30,7
+30,7
@@
#ifndef _MODEST_SERVERSECURITY_COMBO_BOX
#define _MODEST_SERVERSECURITY_COMBO_BOX
#ifndef _MODEST_SERVERSECURITY_COMBO_BOX
#define _MODEST_SERVERSECURITY_COMBO_BOX
-#include <gtk/gtkcombobox.h>
+#include <gtk/gtk.h>
#include "modest-protocol-registry.h"
G_BEGIN_DECLS
#include "modest-protocol-registry.h"
G_BEGIN_DECLS
diff --git
a/src/widgets/modest-sort-criterium-view.h
b/src/widgets/modest-sort-criterium-view.h
index
c064dde
..
904123a
100644
(file)
--- a/
src/widgets/modest-sort-criterium-view.h
+++ b/
src/widgets/modest-sort-criterium-view.h
@@
-31,7
+31,7
@@
#define __MODEST_SORT_CRITERIUM_VIEW_H__
#include <glib-object.h>
#define __MODEST_SORT_CRITERIUM_VIEW_H__
#include <glib-object.h>
-#include <gtk/gtkenums.h>
+#include <gtk/gtk.h>
G_BEGIN_DECLS
G_BEGIN_DECLS
diff --git
a/src/widgets/modest-validating-entry.h
b/src/widgets/modest-validating-entry.h
index
bad8cc5
..
5ce77f3
100644
(file)
--- a/
src/widgets/modest-validating-entry.h
+++ b/
src/widgets/modest-validating-entry.h
@@
-33,7
+33,7
@@
#ifdef MODEST_TOOLKIT_HILDON2
#include <hildon/hildon-entry.h>
#else
#ifdef MODEST_TOOLKIT_HILDON2
#include <hildon/hildon-entry.h>
#else
-#include <gtk/gtkentry.h>
+#include <gtk/gtk.h>
#endif
G_BEGIN_DECLS
#endif
G_BEGIN_DECLS
diff --git
a/src/widgets/modest-vbox-cell-renderer.c
b/src/widgets/modest-vbox-cell-renderer.c
index
af26450
..
e860433
100644
(file)
--- a/
src/widgets/modest-vbox-cell-renderer.c
+++ b/
src/widgets/modest-vbox-cell-renderer.c
@@
-31,7
+31,7
@@
#include <glib/gi18n-lib.h>
#include <glib/gi18n-lib.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
#include <modest-text-utils.h>
#include <modest-vbox-cell-renderer.h>
#include <modest-text-utils.h>
#include <modest-vbox-cell-renderer.h>
diff --git
a/src/widgets/modest-vbox-cell-renderer.h
b/src/widgets/modest-vbox-cell-renderer.h
index
49bbed8
..
c76c280
100644
(file)
--- a/
src/widgets/modest-vbox-cell-renderer.h
+++ b/
src/widgets/modest-vbox-cell-renderer.h
@@
-30,7
+30,7
@@
#ifndef MODEST_VBOX_CELL_RENDERER_H
#define MODEST_VBOX_CELL_RENDERER_H
#include <glib-object.h>
#ifndef MODEST_VBOX_CELL_RENDERER_H
#define MODEST_VBOX_CELL_RENDERER_H
#include <glib-object.h>
-#include <gtk/gtkcellrenderer.h>
+#include <gtk/gtk.h>
G_BEGIN_DECLS
G_BEGIN_DECLS
diff --git
a/src/widgets/modest-window-priv.h
b/src/widgets/modest-window-priv.h
index
84799d2
..
d3ad219
100644
(file)
--- a/
src/widgets/modest-window-priv.h
+++ b/
src/widgets/modest-window-priv.h
@@
-30,7
+30,7
@@
#ifndef __MODEST_WINDOW_PRIV_H__
#define __MODEST_WINDOW_PRIV_H__
#ifndef __MODEST_WINDOW_PRIV_H__
#define __MODEST_WINDOW_PRIV_H__
-#include <gtk/gtkuimanager.h>
+#include <gtk/gtk.h>
#include <tny-account-store.h>
#include "modest-tny-platform-factory.h"
#include "modest-ui-dimming-manager.h"
#include <tny-account-store.h>
#include "modest-tny-platform-factory.h"
#include "modest-ui-dimming-manager.h"
diff --git
a/src/widgets/modest-window.h
b/src/widgets/modest-window.h
index
3084d2b
..
45a267c
100644
(file)
--- a/
src/widgets/modest-window.h
+++ b/
src/widgets/modest-window.h
@@
-46,7
+46,6
@@
G_BEGIN_DECLS
* this way is probably the easiest to maintain
*/
#ifdef MODEST_TOOLKIT_GTK
* this way is probably the easiest to maintain
*/
#ifdef MODEST_TOOLKIT_GTK
-#include <gtk/gtkwindow.h>
typedef GtkWindow ModestWindowParent;
typedef GtkWindowClass ModestWindowParentClass;
#else
typedef GtkWindow ModestWindowParent;
typedef GtkWindowClass ModestWindowParentClass;
#else
diff --git
a/src/widgets/modest-wizard-dialog.c
b/src/widgets/modest-wizard-dialog.c
index
930090a
..
0deda90
100644
(file)
--- a/
src/widgets/modest-wizard-dialog.c
+++ b/
src/widgets/modest-wizard-dialog.c
@@
-41,13
+41,6
@@
*/
#include <config.h>
*/
#include <config.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtknotebook.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkbutton.h>
#include <gtk/gtk.h>
#ifdef HAVE_CONFIG_H
#include <gtk/gtk.h>
#ifdef HAVE_CONFIG_H
diff --git
a/src/widgets/modest-wizard-dialog.h
b/src/widgets/modest-wizard-dialog.h
index
25391cb
..
e6906a9
100644
(file)
--- a/
src/widgets/modest-wizard-dialog.h
+++ b/
src/widgets/modest-wizard-dialog.h
@@
-31,10
+31,7
@@
#ifndef __MODEST_WIZARD_DIALOG_H__
#define __MODEST_WIZARD_DIALOG_H__
#ifndef __MODEST_WIZARD_DIALOG_H__
#define __MODEST_WIZARD_DIALOG_H__
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtknotebook.h>
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
G_BEGIN_DECLS
G_BEGIN_DECLS