← Back to branch summary

~noskcaj/ubuntu/utopic/cairo-dock-plug-ins/upower

« back to all changes in this revision

Viewing changes to clock/src/applet-timer.c

  • Committer: Matthieu Baerts
  • Date: 2014-02-19 23:22:46 UTC
  • mfrom: (1.1.36)
  • Revision ID: matttbe@gmail.com-20140219232246-iopf2zg7s6jby9tt
Tags: 3.3.99.beta1.1~20140219~bzr3061-0ubuntu1
https://launchpad.net/bugs/1253654
* New upstream snapshot.
* Short Upstream ChangeLog:
  - All: updated due to recent API changes and changes in the global style
  - GMenu:
    - Do not create empty menus
    - Show the dialogue to open a new after after the end of the installation
    - Added an option to not show this dialogue
  - Gnome: support Cinnamon logout
  - Logout: display a message to reboot the system after the end of the update
  - Shortcut: improve the support of bookmarks
  - Status-Notifier: support scroll events
  - Terminal: open terminal on middle click
  - Some bugs have been fixed (LP: #1253654), other tweaks
* debian/control:
  - Bumped Cairo-Dock (core) versions
  - Bumped Standard Version (no change needed)

Show diffs side-by-side

added added

removed removed

Lines of Context:
clock/src/applet-timer.c
264
264
                                _cairo_dock_delete_texture (myData.iDateTexture);
265
265
                        
266
266
                        double fScale = (double) iWidth / (double) myData.DimensionData.width;
267
 
                        CairoDockLabelDescription labelDescription;
268
 
                        memset (&labelDescription, 0, sizeof (CairoDockLabelDescription));
269
 
                        labelDescription.iSize = 10;
270
 
                        labelDescription.cFont = (gchar*)"Sans";  // on peut caster car on ne liberera rien.
271
 
                        labelDescription.iWeight = cairo_dock_get_pango_weight_from_1_9 (5);
272
 
                        labelDescription.iStyle = PANGO_STYLE_NORMAL;
 
267
                        GldiTextDescription labelDescription;
 
268
                        memset (&labelDescription, 0, sizeof (GldiTextDescription));
 
269
                        gldi_text_description_set_font (&labelDescription, (gchar*)"Sans 8");  // casted and then set to null
273
270
                        labelDescription.fColorStart[0] = myConfig.fDateColor[0];
274
271
                        labelDescription.fColorStart[1] = myConfig.fDateColor[1];
275
272
                        labelDescription.fColorStart[2] = myConfig.fDateColor[2];
276
 
                        memcpy (&labelDescription.fColorStop[0], &labelDescription.fColorStart[0], sizeof (labelDescription.fColorStop));
277
 
                        labelDescription.fBackgroundColor[3] = 0;
278
 
                        labelDescription.bOutlined = FALSE;
279
 
                        labelDescription.iMargin = 0;
 
273
                        labelDescription.bNoDecorations = TRUE;
280
274
                        cairo_surface_t *pDateSurface = cairo_dock_create_surface_from_text_full (s_cDateBuffer,
281
275
                                &labelDescription,
282
276
                                fScale,
285
279
                        //g_print ("date : %dx%d\n", myData.iDateWidth, myData.iDateHeight);
286
280
                        myData.iDateTexture = cairo_dock_create_texture_from_surface (pDateSurface);
287
281
                        cairo_surface_destroy (pDateSurface);
 
282
                        labelDescription.cFont = NULL;
 
283
                        gldi_text_description_reset (&labelDescription);
288
284
                }
289
285
        }
290
286
        if (bNewDate && myConfig.iShowDate == CAIRO_DOCK_INFO_ON_LABEL)