diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2009-07-02 00:16:23 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-07-02 02:39:23 +0800 |
| commit | b554b165941e9b4e394554591e93e31e5accef16 (patch) | |
| tree | 4232dc565d325a6f5b3c67081fb484c99055d092 /widgets/misc/e-charset-picker.h | |
| parent | 1351c8e4fb443a9705bb1225c3c574c05a36f8ca (diff) | |
| download | gsoc2013-evolution-b554b165941e9b4e394554591e93e31e5accef16.tar gsoc2013-evolution-b554b165941e9b4e394554591e93e31e5accef16.tar.gz gsoc2013-evolution-b554b165941e9b4e394554591e93e31e5accef16.tar.bz2 gsoc2013-evolution-b554b165941e9b4e394554591e93e31e5accef16.tar.lz gsoc2013-evolution-b554b165941e9b4e394554591e93e31e5accef16.tar.xz gsoc2013-evolution-b554b165941e9b4e394554591e93e31e5accef16.tar.zst gsoc2013-evolution-b554b165941e9b4e394554591e93e31e5accef16.zip | |
Fix merge issues in EMAccountEditor.
Diffstat (limited to 'widgets/misc/e-charset-picker.h')
| -rw-r--r-- | widgets/misc/e-charset-picker.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/widgets/misc/e-charset-picker.h b/widgets/misc/e-charset-picker.h index e399cf788c..16f19e3509 100644 --- a/widgets/misc/e-charset-picker.h +++ b/widgets/misc/e-charset-picker.h @@ -18,8 +18,8 @@ * */ -#ifndef E_CHARSETPICKER_H -#define E_CHARSETPICKER_H +#ifndef E_CHARSET_PICKER_H +#define E_CHARSET_PICKER_H #include <gtk/gtk.h> @@ -27,11 +27,6 @@ G_BEGIN_DECLS GtkWidget * e_charset_picker_new (const gchar *default_charset); gchar * e_charset_picker_get_charset (GtkWidget *picker); -gchar * e_charset_picker_dialog (const gchar *title, - const gchar *prompt, - const gchar *default_charset, - GtkWindow *parent); - GSList * e_charset_add_radio_actions (GtkActionGroup *action_group, const gchar *action_prefix, const gchar *default_charset, @@ -40,4 +35,4 @@ GSList * e_charset_add_radio_actions (GtkActionGroup *action_group, G_END_DECLS -#endif /* E_CHARSETPICKER_H */ +#endif /* E_CHARSET_PICKER_H */ |