gnome-panel r10790 - in trunk/applets/clock: . pixmaps

[matthiasc svn gnome org]

Author: matthiasc
Date: Sat Feb  9 18:49:55 2008
New Revision: 10790
URL: http://svn.gnome.org/viewvc/gnome-panel?rev=10790&view=rev

Log:
Use the world map as png


Added:
   trunk/applets/clock/pixmaps/clock-map.png   (contents, props changed)
Modified:
   trunk/applets/clock/ChangeLog
   trunk/applets/clock/clock-map.c
   trunk/applets/clock/pixmaps/Makefile.am

Modified: trunk/applets/clock/clock-map.c
==============================================================================
--- trunk/applets/clock/clock-map.c	(original)
+++ trunk/applets/clock/clock-map.c	Sat Feb  9 18:49:55 2008
@@ -6,7 +6,6 @@
 #include <sys/time.h>
 #include <sys/timeb.h>
 #include <gtk/gtk.h>
-#include <librsvg/rsvg.h>
 #include <math.h>
 
 #include "clock.h"
@@ -196,10 +195,9 @@
         }
 
         if (!priv->stock_map_pixbuf) {
-                /* load it small; resize later */
-                GdkPixbuf *pixbuf = rsvg_pixbuf_from_file_at_size
-                        (ICONDIR "/clock-map.svg",
-                         width, height, NULL);
+                GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file_at_scale
+                        (ICONDIR "/clock-map.png",
+                         width, height, FALSE, NULL);
 
                 priv->width = gdk_pixbuf_get_width (pixbuf);
                 priv->height = gdk_pixbuf_get_height (pixbuf);

Modified: trunk/applets/clock/pixmaps/Makefile.am
==============================================================================
--- trunk/applets/clock/pixmaps/Makefile.am	(original)
+++ trunk/applets/clock/pixmaps/Makefile.am	Sat Feb  9 18:49:55 2008
@@ -7,11 +7,13 @@
 	clock-face-small-day.svg	\
 	clock-face-small-evening.svg	\
 	clock-face-small-night.svg	\
-	clock-map.svg			\
+	clock-map.png		\
 	clock-map-location-marker.png	\
 	clock-map-location-current.png	\
 	clock-map-location-hilight.png
 
-EXTRA_DIST = $(icon_DATA)
+EXTRA_DIST = 		\
+	clock-map.svg	\
+	$(icon_DATA)
 
 MAINTAINERCLEANFILES = Makefile.in

Added: trunk/applets/clock/pixmaps/clock-map.png
==============================================================================
Binary file. No diff available.