diff options
Diffstat (limited to 'mail/em-composer-prefs.h')
| -rw-r--r-- | mail/em-composer-prefs.h | 27 |
1 files changed, 7 insertions, 20 deletions
diff --git a/mail/em-composer-prefs.h b/mail/em-composer-prefs.h index 2e12c7ffb2..83560b13d9 100644 --- a/mail/em-composer-prefs.h +++ b/mail/em-composer-prefs.h @@ -20,10 +20,12 @@ * */ -#ifndef __EM_COMPOSER_PREFS_H__ -#define __EM_COMPOSER_PREFS_H__ +#ifndef EM_COMPOSER_PREFS_H +#define EM_COMPOSER_PREFS_H #include <gtk/gtk.h> +#include <glade/glade.h> +#include <shell/e-shell.h> /* Standard GObject macros */ #define EM_TYPE_COMPOSER_PREFS \ @@ -50,19 +52,17 @@ typedef struct _EMComposerPrefs EMComposerPrefs; typedef struct _EMComposerPrefsClass EMComposerPrefsClass; struct _ESignature; -struct _GladeXML; struct _EMComposerPrefs { GtkVBox parent; - struct _GladeXML *gui; + GladeXML *gui; /* General tab */ /* Default Behavior */ GtkOptionMenu *charset; - GtkColorButton *color; GtkTreeModel *language_model; /* Forwards and Replies */ @@ -70,20 +70,7 @@ struct _EMComposerPrefs { GtkComboBox *reply_style; /* Signatures */ - GtkTreeView *sig_list; - GHashTable *sig_hash; - GtkButton *sig_add; - GtkButton *sig_add_script; - GtkButton *sig_edit; - GtkButton *sig_delete; struct _GtkHTML *sig_preview; - - struct _GladeXML *sig_script_gui; - GtkWidget *sig_script_dialog; - - guint sig_added_id; - guint sig_removed_id; - guint sig_changed_id; }; struct _EMComposerPrefsClass { @@ -91,7 +78,7 @@ struct _EMComposerPrefsClass { }; GType em_composer_prefs_get_type (void); -GtkWidget * em_composer_prefs_new (void); +GtkWidget * em_composer_prefs_new (EShell *shell); void em_composer_prefs_new_signature (GtkWindow *parent, gboolean html_mode); @@ -101,4 +88,4 @@ void em_composer_prefs_new_signature (GtkWindow *parent, G_END_DECLS -#endif /* __EM_COMPOSER_PREFS_H__ */ +#endif /* EM_COMPOSER_PREFS_H */ |