← Back to branch summary

~ubuntu-branches/ubuntu/quantal/cairo-dock-plug-ins/quantal-201208191523

« back to all changes in this revision

Viewing changes to dialog-rendering/src/applet-renderer-text.c

  • Committer: Bazaar Package Importer
  • Author(s): Matthieu Baerts (matttbe)
  • Date: 2010-08-10 00:05:57 UTC
  • mfrom: (1.1.5 upstream)
  • Revision ID: james.westby@ubuntu.com-20100810000557-pfxoz5w7hbyclcqh
Tags: 2.2.0~0beta4-0ubuntu1
https://launchpad.net/bugs/614625
https://launchpad.net/bugs/483963
https://launchpad.net/bugs/485159
https://launchpad.net/bugs/500677
https://launchpad.net/bugs/500979
https://launchpad.net/bugs/521531
https://launchpad.net/bugs/519915
https://launchpad.net/bugs/526138
https://launchpad.net/bugs/531317
https://launchpad.net/bugs/531319
https://launchpad.net/bugs/537115
https://launchpad.net/bugs/537943
https://launchpad.net/bugs/538637
* New Upstream Version (LP: #614625)
* Fixed a few bugs on LP:
 - LP: #483963: Dustbin applet does not display trashes on all volumes
 - LP: #485159: Some apps have problem with Systray
 - LP: #500677: ~/.xsession-errors is too much used by CD
 - LP: #500979: Shortcuts: the order gets messed up
 - LP: #521531: Mail: crashes on Maildir
 - LP: #519915: GTG: create a new applet to control GTG
 - LP: #526138: GMenu doesn't handle desktop file exec strings properly
 - LP: #531317: CMake: Added an error if the prefix of 'cairo-dock-plugins'
                 is not the same 'cairo-dock-core'
 - LP: #531319: CMake: check the version of 'cairo-dock' when building
                 'cairo-dock-plugins'
 - LP: #537115: Click at the position where icon lavel was, the icon
                 and dock still receive the event
 - LP: #537943: Terminal applet shortkey behaviour
 - LP: #538637: Trash applet doesn't create .trashinfo files on XFCE
 - More details on the 'ChangeLog' file
* debian/rules:
 - Autotools has been replaced by CMake
 - cdbs is now used.
* debian/copyright:
 - Updated with the new applets
* debian/control:
 - Autotools has been replaced by CMake
 - Added libcurl4-gnutls-dev, libindicator-dev, libdbusmenu-glib-dev
   libido-0.1-dev, libical-dev, libdbusmenu-gtk-dev as Build-deps
 - Bump Standard-Version to 3.9.1
 - Wget is required for dnd2share applet
 - Added the exact realease for 'cairo-dock-dev' in order to prevent any
    build error if this package is not already available (thx to didrocks)
* debian/cairo-dock-plug-ins*.install:
 - All sonames are now installed into lib32 or lib64 (lib*)

Show diffs side-by-side

added added

removed removed

Lines of Context:
dialog-rendering/src/applet-renderer-text.c
24
24
#include "applet-renderer-text.h"
25
25
 
26
26
 
27
 
CDTextParameters *rendering_configure_text (CairoDialog *pDialog, cairo_t *pSourceContext, gpointer *pConfig)
 
27
CDTextParameters *rendering_configure_text (CairoDialog *pDialog, gpointer *pConfig)
28
28
{
29
29
        cd_debug ("");
30
30
        CDTextParameters *pText = g_new0 (CDTextParameters, 1);
41
41
        if (cInitialText != NULL)
42
42
        {
43
43
                pText->pTextSurface = cairo_dock_create_surface_from_text (cInitialText,
44
 
                        pSourceContext,
45
44
                        &pText->textDescription,
46
45
                        &iTextWidth, &iTextHeight);
47
46
        }
97
96
        cairo_surface_destroy (pText->pTextSurface);
98
97
        pText->pTextSurface = NULL;
99
98
        
100
 
        cairo_t *pCairoContext = cairo_dock_create_context_from_window (CAIRO_CONTAINER (pDialog));
101
 
        g_return_if_fail (cairo_status (pCairoContext) == CAIRO_STATUS_SUCCESS);
102
99
        pText->pTextSurface = cairo_dock_create_surface_from_text (cNewText,
103
 
                pCairoContext,
104
100
                &pText->textDescription,
105
101
                &iTextWidth, &iTextHeight);
106
 
        cairo_destroy (pCairoContext);
107
102
        
108
103
        if (iTextWidth > pDialog->iInteractiveWidth || iTextHeight > pDialog->iInteractiveHeight)
109
104
                gtk_widget_set_size_request (pDialog->pInteractiveWidget, iTextWidth, iTextHeight);
114
109
{
115
110
        CairoDialogRenderer *pRenderer = g_new0 (CairoDialogRenderer, 1);
116
111
        pRenderer->render = rendering_draw_text_in_dialog ;
117
 
        pRenderer->configure = rendering_configure_text;
 
112
        pRenderer->configure = (CairoDialogConfigureRendererFunc)rendering_configure_text;
118
113
        pRenderer->free_data = rendering_free_text_data;
119
114
        pRenderer->update = rendering_update_text;
120
115