[gdm/wip/initial-setup2] initial-setup: Use a png for the welcome image

[Matthias Clasen <matthiasc src gnome org>]

commit d0901fa60bfc24d7528ac6fd9d59998f652e1263
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri May 11 21:59:35 2012 -0400

    initial-setup: Use a png for the welcome image

 gui/initial-setup/Makefile.am         |    4 ++--
 gui/initial-setup/gdm-initial-setup.c |    8 ++++----
 gui/initial-setup/setup.gresource.xml |    2 +-
 gui/initial-setup/setup.ui            |    2 +-
 gui/initial-setup/welcome-image.jpg   |  Bin 55997 -> 0 bytes
 gui/initial-setup/welcome-image.png   |  Bin 0 -> 142308 bytes
 6 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/gui/initial-setup/Makefile.am b/gui/initial-setup/Makefile.am
index e73c0b8..33e0e01 100644
--- a/gui/initial-setup/Makefile.am
+++ b/gui/initial-setup/Makefile.am
@@ -24,7 +24,7 @@ timedated.h: Makefile.am timedated1-interface.xml
 		--generate-c-code timedated \
 		$(srcdir)/timedated1-interface.xml
 
-setup_resources.c: setup.gresource.xml setup.ui welcome-image.jpg
+setup_resources.c: setup.gresource.xml setup.ui welcome-image.png
 	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source $(srcdir)/setup.gresource.xml
 
 gdm_initial_setup_SOURCES =	\
@@ -46,7 +46,7 @@ EXTRA_DIST = \
 	$(sys_DATA) \
 	timedated1-interface.xml \
 	setup.ui \
-	welcome-image.jpg \
+	welcome-image.png \
 	application.gresource.xml
 
 BUILT_SOURCES = $(dbus_built_sources) setup_resources.c
diff --git a/gui/initial-setup/gdm-initial-setup.c b/gui/initial-setup/gdm-initial-setup.c
index b86ece7..5645cdd 100644
--- a/gui/initial-setup/gdm-initial-setup.c
+++ b/gui/initial-setup/gdm-initial-setup.c
@@ -94,10 +94,10 @@ prepare_welcome_page (SetupData *setup)
         const gchar *filename;
 
         widget = WID("welcome-image");
-        filename = UIDIR "/welcome-image.jpg";
-        if (!g_file_test (filename, G_FILE_TEST_EXISTS))
-                filename = "welcome-image.jpg";
-        gtk_image_set_from_file (GTK_IMAGE (widget), filename);
+        filename = UIDIR "/welcome-image.png";
+        if (g_file_test (filename, G_FILE_TEST_EXISTS)) {
+                gtk_image_set_from_file (GTK_IMAGE (widget), filename);
+        }
 }
 
 /* Network page {{{1 */
diff --git a/gui/initial-setup/setup.gresource.xml b/gui/initial-setup/setup.gresource.xml
index d9e697d..ee890a8 100644
--- a/gui/initial-setup/setup.gresource.xml
+++ b/gui/initial-setup/setup.gresource.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
   <gresource prefix="/image">
-    <file preprocess="to-pixdata">welcome-image.jpg</file>
+    <file preprocess="to-pixdata">welcome-image.png</file>
   </gresource>
   <gresource prefix="/ui">
     <file preprocess="xml-stripblanks">setup.ui</file>
diff --git a/gui/initial-setup/setup.ui b/gui/initial-setup/setup.ui
index 2fdccae..34cd0c3 100644
--- a/gui/initial-setup/setup.ui
+++ b/gui/initial-setup/setup.ui
@@ -304,7 +304,7 @@
             <property name="visible">True</property>
             <property name="halign">center</property>
             <property name="valign">start</property>
-            <property name="file">resource:///image/welcome-image.jpg</property>
+            <property name="pixbuf">resource:///image/welcome-image.png</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
diff --git a/gui/initial-setup/welcome-image.png b/gui/initial-setup/welcome-image.png
new file mode 100644
index 0000000..275925a
Binary files /dev/null and b/gui/initial-setup/welcome-image.png differ