gimp r27199 - in trunk: . app/dialogs data/images

[neo svn gnome org]

Author: neo
Date: Thu Oct  9 19:16:54 2008
New Revision: 27199
URL: http://svn.gnome.org/viewvc/gimp?rev=27199&view=rev

Log:
2008-10-09  Sven Neumann  <sven gimp org>

	* data/images/Makefile.am
	* data/images/gimp-devel-logo.png: added 128x128 version of
	wilber-devel.png.

	* app/dialogs/about-dialog.c (about_dialog_load_logo): use
	gimp-devel-logo.png for unstable releasees.



Added:
   trunk/data/images/gimp-devel-logo.png   (contents, props changed)
Modified:
   trunk/ChangeLog
   trunk/app/dialogs/about-dialog.c
   trunk/data/images/Makefile.am

Modified: trunk/app/dialogs/about-dialog.c
==============================================================================
--- trunk/app/dialogs/about-dialog.c	(original)
+++ trunk/app/dialogs/about-dialog.c	Thu Oct  9 19:16:54 2008
@@ -46,21 +46,21 @@
 
 typedef struct
 {
-  GtkWidget    *dialog;
+  GtkWidget   *dialog;
 
-  GtkWidget    *anim_area;
-  PangoLayout  *layout;
+  GtkWidget   *anim_area;
+  PangoLayout *layout;
 
-  gint          n_authors;
-  gint          shuffle[G_N_ELEMENTS (authors) - 1];  /* NULL terminated */
+  gint         n_authors;
+  gint         shuffle[G_N_ELEMENTS (authors) - 1];  /* NULL terminated */
 
-  guint         timer;
+  guint        timer;
 
-  gint          index;
-  gint          animstep;
-  gint          textrange[2];
-  gint          state;
-  gboolean      visible;
+  gint         index;
+  gint         animstep;
+  gint         textrange[2];
+  gint         state;
+  gboolean     visible;
 } GimpAboutDialog;
 
 
@@ -217,7 +217,11 @@
   gchar     *filename;
 
   filename = g_build_filename (gimp_data_directory (), "images",
+#ifdef GIMP_UNSTABLE
+                               "gimp-devel-logo.png",
+#else
                                "gimp-logo.png",
+#endif
                                NULL);
 
   pixbuf = gdk_pixbuf_new_from_file (filename, NULL);

Modified: trunk/data/images/Makefile.am
==============================================================================
--- trunk/data/images/Makefile.am	(original)
+++ trunk/data/images/Makefile.am	Thu Oct  9 19:16:54 2008
@@ -2,8 +2,14 @@
 
 imagedatadir = $(gimpdatadir)/images
 
+if GIMP_UNSTABLE
+GIMP_LOGO = gimp-devel-logo.png
+else
+GIMP_LOGO = gimp-logo.png
+endif
+
 imagedata_DATA = \
-	gimp-logo.png	\
+	$(GIMP_LOGO)	\
 	gimp-splash.png	\
 	wilber.png
 

Added: trunk/data/images/gimp-devel-logo.png
==============================================================================
Binary file. No diff available.