Skip to content
Permalink
Browse files

clock: Use new GdkPixbuf API to load resources

  • Loading branch information...
vuntz authored and raveit65 committed Feb 7, 2012
1 parent cfe0603 commit ee07e90d14c15dbf45899d6c70614fe2068cd640
Showing with 6 additions and 19 deletions.
  1. +5 −18 applets/clock/clock-map.c
  2. +1 −1 configure.ac
@@ -136,16 +136,10 @@ clock_map_init (ClockMap *this)

for (i = 0; i < MARKER_NB; i++) {
char *resource;
GInputStream *stream;

resource = g_strconcat (CLOCK_RESOURCE_PATH "icons/", marker_files[i], NULL);
stream = g_resources_open_stream (resource, 0, NULL);
priv->location_marker_pixbuf[i] = gdk_pixbuf_new_from_resource (resource, NULL);
g_free (resource);

if (stream != NULL) {
priv->location_marker_pixbuf[i] = gdk_pixbuf_new_from_stream (stream, NULL, NULL);
g_object_unref (stream);
}
}
}

@@ -217,17 +211,10 @@ clock_map_refresh (ClockMap *this)
}

if (!priv->stock_map_pixbuf) {
GInputStream *stream = g_resources_open_stream (CLOCK_RESOURCE_PATH "icons/clock-map.png",
0, NULL);
if (stream != NULL) {
GdkPixbuf *pixbuf = gdk_pixbuf_new_from_stream_at_scale (stream,
priv->width, priv->height,
FALSE,
NULL, NULL);
g_object_unref (stream);

priv->stock_map_pixbuf = pixbuf;
}
priv->stock_map_pixbuf = gdk_pixbuf_new_from_resource_at_scale (CLOCK_RESOURCE_PATH "icons/clock-map.png",
priv->width, priv->height,
FALSE,
NULL);
}

clock_map_place_locations (this);
@@ -55,7 +55,7 @@ fi
LT_LIB_M

LIBMATE_DESKTOP_REQUIRED=1.17.0
GDK_PIXBUF_REQUIRED=2.7.1
GDK_PIXBUF_REQUIRED=2.25.2
PANGO_REQUIRED=1.15.4
GLIB_REQUIRED=2.50.0
LIBMATE_MENU_REQUIRED=1.10.0

0 comments on commit ee07e90

Please sign in to comment.
You can’t perform that action at this time.