diff options
| -rw-r--r-- | e-util/ChangeLog | 7 | ||||
| -rw-r--r-- | e-util/e-gui-utils.c | 27 | ||||
| -rw-r--r-- | e-util/e-gui-utils.h | 1 | ||||
| -rw-r--r-- | e-util/e-util.h | 34 |
4 files changed, 24 insertions, 45 deletions
diff --git a/e-util/ChangeLog b/e-util/ChangeLog index bd5c7e3e76..50d649d4d0 100644 --- a/e-util/ChangeLog +++ b/e-util/ChangeLog @@ -1,3 +1,10 @@ +2008-08-13 Matthew Barnes <mbarnes@redhat.com> + + * e-gui-utils.c (e_create_image_widget): + Remove this unused function. + + * e-util.h: Cosmetic cleanups. + 2008-08-11 Matthew Barnes <mbarnes@redhat.com> ** Fixes part of bug #546892 diff --git a/e-util/e-gui-utils.c b/e-util/e-gui-utils.c index c4fef1ba16..cff2b500b0 100644 --- a/e-util/e-gui-utils.c +++ b/e-util/e-gui-utils.c @@ -52,30 +52,3 @@ e_icon_for_mime_type (const char *mime_type, int size_hint) return pixbuf; } - -GtkWidget *e_create_image_widget(gchar *name, - gchar *string1, gchar *string2, - gint int1, gint int2) -{ - GtkWidget *alignment = NULL; - GtkWidget *w; - - if (string1) { - w = gtk_image_new_from_icon_name ( - string1, GTK_ICON_SIZE_DIALOG); - - gtk_misc_set_alignment (GTK_MISC (w), 0.5, 0.5); - - alignment = gtk_widget_new(gtk_alignment_get_type(), - "child", w, - "xalign", (double) 0, - "yalign", (double) 0, - "xscale", (double) 0, - "yscale", (double) 0, - NULL); - - gtk_widget_show_all (alignment); - } - - return alignment; -} diff --git a/e-util/e-gui-utils.h b/e-util/e-gui-utils.h index 740c77e95e..bbeefa9c61 100644 --- a/e-util/e-gui-utils.h +++ b/e-util/e-gui-utils.h @@ -4,6 +4,5 @@ #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); #endif /* E_GUI_UTILS_H */ diff --git a/e-util/e-util.h b/e-util/e-util.h index 2beac806de..63cb6f4a5c 100644 --- a/e-util/e-util.h +++ b/e-util/e-util.h @@ -30,13 +30,10 @@ #include <gconf/gconf-client.h> #include <cairo.h> -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #include <e-util/e-util-marshal.h> +G_BEGIN_DECLS + typedef enum { E_FOCUS_NONE, E_FOCUS_CURRENT, @@ -104,27 +101,30 @@ gchar * e_ascii_dtostr (gchar *buffer, /* Alternating char * and int arguments with a NULL char * to end. Less than 0 for the int means copy the whole string. */ -gchar * e_strdup_append_strings (gchar *first_string, +gchar * e_strdup_append_strings (gchar *first_string, ...); -cairo_font_options_t * get_font_options (void); +cairo_font_options_t * + get_font_options (void); void e_file_update_save_path (gchar *uri, gboolean free); gchar * e_file_get_save_path (void); -gboolean e_file_lock_create (void); -void e_file_lock_destroy (void); -gboolean e_file_lock_exists (void); +gboolean e_file_lock_create (void); +void e_file_lock_destroy (void); +gboolean e_file_lock_exists (void); -char *e_util_guess_mime_type (const char *filename); -char *e_util_filename_to_uri (const char *filename); -char *e_util_uri_to_filename (const char *uri); +gchar * e_util_guess_mime_type (const gchar *filename); +gchar * e_util_filename_to_uri (const gchar *filename); +gchar * e_util_uri_to_filename (const gchar *uri); -gboolean e_util_read_file (const char *filename, gboolean filename_is_uri, char **buffer, gsize *read, GError **error); +gboolean e_util_read_file (const gchar *filename, + gboolean filename_is_uri, + gchar **buffer, + gsize *read, + GError **error); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* _E_UTIL_H_ */ |