evolution r35980 - trunk/e-util

[mbarnes svn gnome org]

Author: mbarnes
Date: Wed Aug 13 15:29:35 2008
New Revision: 35980
URL: http://svn.gnome.org/viewvc/evolution?rev=35980&view=rev

Log:
2008-08-13  Matthew Barnes  <mbarnes redhat com>

	* e-util/e-gui-utils.c (e_create_image_widget):
	Remove this unused function.

	* e-util/e-util.h: Cosmetic cleanups.



Modified:
   trunk/e-util/ChangeLog
   trunk/e-util/e-gui-utils.c
   trunk/e-util/e-gui-utils.h
   trunk/e-util/e-util.h

Modified: trunk/e-util/e-gui-utils.c
==============================================================================
--- trunk/e-util/e-gui-utils.c	(original)
+++ trunk/e-util/e-gui-utils.c	Wed Aug 13 15:29:35 2008
@@ -52,30 +52,3 @@
 
 	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;
-}

Modified: trunk/e-util/e-gui-utils.h
==============================================================================
--- trunk/e-util/e-gui-utils.h	(original)
+++ trunk/e-util/e-gui-utils.h	Wed Aug 13 15:29:35 2008
@@ -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 */

Modified: trunk/e-util/e-util.h
==============================================================================
--- trunk/e-util/e-util.h	(original)
+++ trunk/e-util/e-util.h	Wed Aug 13 15:29:35 2008
@@ -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 @@
 
 /* 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);
-
-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);
-
-gboolean e_util_read_file  (const char *filename, gboolean filename_is_uri, char **buffer, gsize *read,  GError **error);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+gboolean	e_file_lock_create		(void);
+void		e_file_lock_destroy		(void);
+gboolean 	e_file_lock_exists		(void);
+
+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 gchar *filename,
+						 gboolean filename_is_uri,
+						 gchar **buffer,
+						 gsize *read,
+						 GError **error);
+
+G_END_DECLS
 
 #endif /* _E_UTIL_H_ */