← Back to branch summary

~ubuntu-branches/ubuntu/quantal/gnome-panel/quantal

« back to all changes in this revision

Viewing changes to applets/clock/clock-face.c

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2012-02-08 00:17:11 UTC
  • mfrom: (1.13.15)
  • Revision ID: package-import@ubuntu.com-20120208001711-npwmthl0c6iy3s9a
Tags: 1:3.3.5-0ubuntu1
* New upstream release.
* debian/control.in:
  - Bump minimum glib to 2.31.14
* debian/patches/13_disable_missing_help.patch:
  Updated patch from bugzilla
* debian/patches/14_revert-timedate-change.patch:
  - Revert switch to systemd timedate protocol until ubuntu-system-
    services supports it

Show diffs side-by-side

added added

removed removed

Lines of Context:
applets/clock/clock-face.c
15
15
#include <math.h>
16
16
#include <time.h>
17
17
 
18
 
#include <librsvg/rsvg.h>
19
 
 
 
18
#include "clock.h"
20
19
#include "clock-face.h"
21
20
#include "clock-location.h"
 
21
#include "clock-utils.h"
22
22
 
23
23
static GHashTable *pixbuf_cache = NULL;
24
24
 
434
434
        }
435
435
 
436
436
        /* The pixbuf is not cached, let's load it */
437
 
        name = g_strconcat (ICONDIR, "/clock-face-", size_string[priv->size],
 
437
        name = g_strconcat (CLOCK_RESOURCE_PATH "icons/",
 
438
                            "clock-face-", size_string[priv->size],
438
439
                            "-", daytime_string[priv->timeofday], ".svg",
439
440
                            NULL);
440
 
        priv->face_pixbuf = rsvg_pixbuf_from_file_at_size (name,
441
 
                                                           width, height,
442
 
                                                           NULL);
 
441
        priv->face_pixbuf = clock_utils_pixbuf_from_svg_resource_at_size (name,
 
442
                                                                          width, height);
443
443
        g_free (name);
444
444
 
445
445
        if (!priv->face_pixbuf) {
446
 
                name = g_strconcat (ICONDIR, "/clock-face-",
447
 
                                    size_string[priv->size], ".svg", NULL);
448
 
                priv->face_pixbuf = rsvg_pixbuf_from_file_at_size (name,
449
 
                                                                   width,
450
 
                                                                   height,
451
 
                                                                   NULL);
 
446
                name = g_strconcat (CLOCK_RESOURCE_PATH "icons/",
 
447
                                    "clock-face-", size_string[priv->size], ".svg",
 
448
                                    NULL);
 
449
                priv->face_pixbuf = clock_utils_pixbuf_from_svg_resource_at_size (name,
 
450
                                                                                  width, height);
452
451
                g_free (name);
453
452
        }
454
453