diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2009-04-25 22:16:00 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-04-25 22:16:00 +0800 |
| commit | faf1c14c11f3e6026f786e9587715c10b13c723e (patch) | |
| tree | 3dbf5816532cbea2510b4438c7c40d91fc426d3a /mail/em-folder-utils.h | |
| parent | 86fdd3a1cba7c156cfa127322e258f5636b45a99 (diff) | |
| download | gsoc2013-evolution-faf1c14c11f3e6026f786e9587715c10b13c723e.tar.gz gsoc2013-evolution-faf1c14c11f3e6026f786e9587715c10b13c723e.tar.zst gsoc2013-evolution-faf1c14c11f3e6026f786e9587715c10b13c723e.zip | |
Manual conflict resolution
Diffstat (limited to 'mail/em-folder-utils.h')
| -rw-r--r-- | mail/em-folder-utils.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mail/em-folder-utils.h b/mail/em-folder-utils.h index e3161bdcc0..deed1407e9 100644 --- a/mail/em-folder-utils.h +++ b/mail/em-folder-utils.h @@ -24,7 +24,7 @@ #ifndef EM_FOLDER_UTILS_H #define EM_FOLDER_UTILS_H -#include <glib.h> +#include <gtk/gtk.h> #include <camel/camel-folder.h> #include <camel/camel-store.h> #include <mail/em-folder-tree.h> @@ -47,7 +47,8 @@ void em_folder_utils_delete_folder (CamelFolder *folder); void em_folder_utils_rename_folder (CamelFolder *folder); void em_folder_utils_create_folder (CamelFolderInfo *folderinfo, - EMFolderTree * emft); + EMFolderTree * emft, + GtkWindow *parent); const gchar * em_folder_utils_get_icon_name (guint32 flags); |