9 files changed, 16 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 59fc9f8f..0a4b0f87 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Tue Aug 13 11:52:28 2002  George Lebl <jirka@5z.com>
+
+	* pixmaps/Makefile.am, pixmaps/gdm.png, pixmaps/gdm-foot-logo.png:
+	  Create new icon myself.  New large logo thing with the new foot
+
+	* config/gdm.conf.in, daemon/gdm.h, gui/*.desktop.in: use the new
+	  logo and icon everywhere
+
 Tue Aug 13 08:27:18 2002  George Lebl <jirka@5z.com>
 
 	* config/gdm.conf.in: update comment on top to be correct
diff --git a/config/gdm.conf.in b/config/gdm.conf.in
index 92a30f8d..11245197 100644
--- a/config/gdm.conf.in
+++ b/config/gdm.conf.in
@@ -97,9 +97,9 @@ DefaultLocale=en_US
 # These are things excluded from the face browser, not from logging in
 Exclude=bin,daemon,adm,lp,sync,shutdown,halt,mail,news,uucp,operator,nobody,gdm,postgres,pvm,rpm
 GlobalFaceDir=@EXPANDED_DATADIR@/faces/
-Icon=@EXPANDED_PIXMAPDIR@/gdm.xpm
+Icon=@EXPANDED_PIXMAPDIR@/gdm.png
 LocaleFile=@EXPANDED_LOCALEDIR@/locale.alias
-Logo=@EXPANDED_PIXMAPDIR@/gnome-logo-large.png
+Logo=@EXPANDED_PIXMAPDIR@/gdm-foot-logo.png
 Quiver=true
 SystemMenu=true
 # Note to distributors, if you wish to have a different Welcome string
diff --git a/daemon/gdm.h b/daemon/gdm.h
index 2b2b2ea8..687237c3 100644
--- a/daemon/gdm.h
+++ b/daemon/gdm.h
@@ -200,10 +200,10 @@ enum {
 #define GDM_KEY_MINIMALUID "greeter/MinimalUID=100"
 #define GDM_KEY_FACE "greeter/DefaultFace=" EXPANDED_PIXMAPDIR "nobody.png"
 #define GDM_KEY_FACEDIR "greeter/GlobalFaceDir=" EXPANDED_DATADIR "/faces/"
-#define GDM_KEY_ICON "greeter/Icon=" EXPANDED_PIXMAPDIR "/gdm.xpm"
+#define GDM_KEY_ICON "greeter/Icon=" EXPANDED_PIXMAPDIR "/gdm.png"
 #define GDM_KEY_LOCALE "greeter/DefaultLocale=english"
 #define GDM_KEY_LOCFILE "greeter/LocaleFile=" EXPANDED_LOCALEDIR "/locale.alias"
-#define GDM_KEY_LOGO "greeter/Logo=" EXPANDED_PIXMAPDIR "/gnome-logo-large.png"
+#define GDM_KEY_LOGO "greeter/Logo=" EXPANDED_PIXMAPDIR "/gdm-foot-logo.png"
 #define GDM_KEY_QUIVER "greeter/Quiver=true"
 #define GDM_KEY_SYSMENU "greeter/SystemMenu=true"
 #define GDM_KEY_CONFIGURATOR "daemon/Configurator=" EXPANDED_GDMCONFIGDIR "/gdmsetup --disable-sound --disable-crash-dialog"
diff --git a/gui/gdmflexiserver-xnest.desktop.in b/gui/gdmflexiserver-xnest.desktop.in
index 9c14ca63..964ff1e2 100644
--- a/gui/gdmflexiserver-xnest.desktop.in
+++ b/gui/gdmflexiserver-xnest.desktop.in
@@ -6,7 +6,7 @@ _Comment=Log in as another user inside a nested window
 # this is minorly evil
 TryExec=Xnest
 Exec=gdmflexiserver --xnest
-Icon=
+Icon=gdm.png
 Terminal=0
 Type=Application
 Categories=Application;System;
diff --git a/gui/gdmflexiserver.desktop.in b/gui/gdmflexiserver.desktop.in
index 05dabc9c..60e36258 100644
--- a/gui/gdmflexiserver.desktop.in
+++ b/gui/gdmflexiserver.desktop.in
@@ -3,7 +3,7 @@ Encoding=UTF-8
 _Name=New login
 _Comment=Log in as another user without loging out
 Exec=gdmflexiserver
-Icon=
+Icon=gdm.png
 Terminal=0
 Type=Application
 Categories=Application;System;
diff --git a/gui/gdmsetup.desktop.in b/gui/gdmsetup.desktop.in
index d334e518..6ddca729 100644
--- a/gui/gdmsetup.desktop.in
+++ b/gui/gdmsetup.desktop.in
@@ -4,7 +4,7 @@ _Name=GDM Configurator
 _Comment=A graphical application for configuring the GNOME Display Manager (GDM)
 TryExec=gdmsetup
 Exec=gdmsetup
-Icon=gdm.xpm
+Icon=gdm.png
 Terminal=0
 Type=Application
 Categories=Application;System;
diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am
index 05d32d0d..5b6d18da 100644
--- a/pixmaps/Makefile.am
+++ b/pixmaps/Makefile.am
@@ -1,6 +1,6 @@
 pixmapdir = $(datadir)/pixmaps
 
-BITMAPS = gdm.xpm nobody.png nohost.png
+BITMAPS = gdm.png gdm-foot-logo.png gdm.xpm nobody.png nohost.png
 
 pixmap_DATA = $(BITMAPS)
 
diff --git a/pixmaps/gdm-foot-logo.png b/pixmaps/gdm-foot-logo.png
new file mode 100644
index 00000000..643e4c26
--- /dev/null
+++ b/pixmaps/gdm-foot-logo.png
diff --git a/pixmaps/gdm.png b/pixmaps/gdm.png
new file mode 100644
index 00000000..241c4884
--- /dev/null
+++ b/pixmaps/gdm.png