← Back to branch summary

~ubuntu-branches/ubuntu/precise/cairo-dock/precise

« back to all changes in this revision

Viewing changes to src/gldit/cairo-dock-icon-loader.c

  • Committer: Bazaar Package Importer
  • Author(s): Matthieu Baerts (matttbe)
  • Date: 2010-10-06 19:23:03 UTC
  • mfrom: (1.1.13 upstream)
  • Revision ID: james.westby@ubuntu.com-20101006192303-o9k0z64l9mx5irip
Tags: 2.2.0~4-0ubuntu1
https://launchpad.net/bugs/653702
https://launchpad.net/bugs/611738
https://launchpad.net/bugs/518628
* New Upstream Version (LP: #653702)
* Fixed a few bugs:
 - Fixed a random crash if CD is launched much time before the WM
 - Improved the OpenGL backend.
 - Some Images paths were wrong
 - Icon label text was truncated (LP: #611738)
 - Fixed a bug when the font was too big
 - Gauges: Add a line return in order to read all Readme file
 - Dialogues don't respect selected font (LP: #518628)
* data/help.conf.in:
 - Removed the Gnome-Panel: Used the right gconf key

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/gldit/cairo-dock-icon-loader.c
249
249
        if ((icon->pIconBuffer == pPrevSurface || icon->pIconBuffer == NULL) &&
250
250
                (icon->iIconTexture == iPrevTexture || icon->iIconTexture == 0))
251
251
        {
252
 
                gchar *cIconPath = cairo_dock_generate_file_path (CAIRO_DOCK_DEFAULT_ICON_NAME);
253
 
                if (cIconPath == NULL || ! g_file_test (cIconPath, G_FILE_TEST_EXISTS))
 
252
                gchar *cIconPath = cairo_dock_search_image_s_path (CAIRO_DOCK_DEFAULT_ICON_NAME);
 
253
                if (cIconPath == NULL)  // fichier non trouve.
254
254
                {
255
 
                        g_free (cIconPath);
256
255
                        cIconPath = g_strdup (CAIRO_DOCK_SHARE_DATA_DIR"/"CAIRO_DOCK_DEFAULT_ICON_NAME);
257
256
                }
258
257
                icon->pIconBuffer = cairo_dock_create_surface_from_image_simple (cIconPath,
490
489
}
491
490
 
492
491
 
493
 
void cairo_dock_reload_buffers_in_dock (gchar *cDockName, CairoDock *pDock, gpointer data)
 
492
void cairo_dock_reload_buffers_in_dock (CairoDock *pDock, gboolean bReloadAppletsToo, gboolean bRecursive)
494
493
{
495
 
        gboolean bReloadAppletsToo = GPOINTER_TO_INT (data);
496
 
        cd_message ("%s (%s, %d)", __func__, cDockName, bReloadAppletsToo);
 
494
        cd_message ("%s (%d, %d)", __func__, bReloadAppletsToo, bRecursive);
497
495
 
498
496
        double fFlatDockWidth = - myIcons.iIconGap;
499
497
        pDock->iMaxIconHeight = 0;
514
512
                        cairo_dock_trigger_load_icon_buffers (icon, CAIRO_CONTAINER (pDock));  // fait un set_icon_size
515
513
                        icon->fWidth *= pDock->container.fRatio;
516
514
                        icon->fHeight *= pDock->container.fRatio;
 
515
                        
 
516
                        if (bRecursive && icon->pSubDock != NULL)
 
517
                        {
 
518
                                cairo_dock_synchronize_one_sub_dock_orientation (icon->pSubDock, pDock, FALSE);
 
519
                                cairo_dock_reload_buffers_in_dock (icon->pSubDock, bReloadAppletsToo, bRecursive);
 
520
                        }
517
521
                }
518
522
                
519
523
                //g_print (" =size <- %.2fx%.2f\n", icon->fWidth, icon->fHeight);