← Back to branch summary

~cairo-dock-team/ubuntu/oneiric/cairo-dock-plug-ins/2.3.0-2.1

« back to all changes in this revision

Viewing changes to shortcuts/src/applet-load-icons.c

  • Committer: Bazaar Package Importer
  • Author(s): Matthieu Baerts (matttbe), Matthieu Baerts (matttbe), Didier Roche
  • Date: 2010-09-18 14:20:27 UTC
  • mfrom: (1.1.7 upstream)
  • Revision ID: james.westby@ubuntu.com-20100918142027-b0zsay70mqxv63l0
Tags: 2.2.0~2-0ubuntu1
https://launchpad.net/bugs/638529
https://launchpad.net/bugs/500677
https://launchpad.net/bugs/637692
[ Matthieu Baerts (matttbe) ]
* New Upstream Version (LP: #638529)
* Fixed a few bugs on LP:
 - Fixed a crash in rainbow view when the cone is completely opened
 - Fixed a crash in rainbow view if the subdock is empty
 - Installed in lib directory by default even in 64bits arch
 - Status-Notifier: fixed few bugs
 - Clock applet:
   - Notify of missed tasks (moved some functions to a new file)
   - Fixed a little memory leak
 - Removed some 'g_print' (LP: #500677: xsession-errors log)
* Updated translations
* debian/control
 - Updated the version of cairo-dock-dev and cairo-dock-core

[ Didier Roche ]
* debian/control: depends on latest libindicator-dev (LP: #637692)

Show diffs side-by-side

added added

removed removed

Lines of Context:
shortcuts/src/applet-load-icons.c
50
50
        if (cairo_dock_compare_icons_name (pNewIcon, pIcon) <= 0)
51
51
        {
52
52
                pNewIcon->fOrder = pIcon->fOrder - 1;
53
 
                g_print ("name : %s <= %s -> %.2f\n", pNewIcon->cName, pIcon->cName, pNewIcon->fOrder);
 
53
                //g_print ("name : %s <= %s -> %.2f\n", pNewIcon->cName, pIcon->cName, pNewIcon->fOrder);
54
54
                return;
55
55
        }
56
56
        
69
69
                                Icon *pPrevIcon = ic->prev->data;
70
70
                                pNewIcon->fOrder = (pIcon->fOrder + pPrevIcon->fOrder) / 2;
71
71
                        }
72
 
                        g_print ("  name : %s < %s -> %.2f\n", pNewIcon->cName, pIcon->cName, pNewIcon->fOrder);
 
72
                        //g_print ("  name : %s < %s -> %.2f\n", pNewIcon->cName, pIcon->cName, pNewIcon->fOrder);
73
73
                        break;
74
74
                }
75
75
                pNewIcon->fOrder = pIcon->fOrder + 1;
81
81
{
82
82
        CD_APPLET_ENTER;
83
83
        
84
 
        g_print (" * event %d on network '%s'\n", iEventType, cURI);
 
84
        //g_print (" * event %d on network '%s'\n", iEventType, cURI);
85
85
        GList *pIconsList = CD_APPLET_MY_ICONS_LIST;
86
86
        CairoContainer *pContainer = CD_APPLET_MY_ICONS_LIST_CONTAINER;
87
87
        CD_APPLET_LEAVE_IF_FAIL (pContainer != NULL);
100
100
                                cd_warning ("  an unknown network was removed");
101
101
                                return ;
102
102
                        }
103
 
                        g_print (" %s will be removed\n", pConcernedIcon->cName);
 
103
                        //g_print (" %s will be removed\n", pConcernedIcon->cName);
104
104
                        
105
105
                        CD_APPLET_REMOVE_ICON_FROM_MY_ICONS_LIST (pConcernedIcon);
106
106
                }
127
127
                        
128
128
                        //\_______________________ on la place au bon endroit suivant son nom.
129
129
                        cd_shortcuts_set_icon_order_by_name (pNewIcon, pIconsList);
130
 
                        g_print (" new network : %s, order = %.2f\n", pNewIcon->cName, pNewIcon->fOrder);
 
130
                        //g_print (" new network : %s, order = %.2f\n", pNewIcon->cName, pNewIcon->fOrder);
131
131
                        
132
132
                        //\_______________________ on l'insere dans la liste.
133
133
                        CD_APPLET_ADD_ICON_IN_MY_ICONS_LIST (pNewIcon);
154
154
                                cd_warning ("  an unknown network was modified");
155
155
                                return ;
156
156
                        }
157
 
                        g_print (" %s is modified\n", pConcernedIcon->cName);
 
157
                        //g_print (" %s is modified\n", pConcernedIcon->cName);
158
158
                        
159
159
                        //\_______________________ on recupere les infos actuelles.
160
160
                        Icon *pNewIcon = cairo_dock_fm_create_icon_from_URI (cURI, pContainer, CAIRO_DOCK_FM_SORT_BY_NAME);
168
168
                        //\_______________________ on remplace l'icone si des choses ont change.
169
169
                        if (cairo_dock_strings_differ (pConcernedIcon->cName, pNewIcon->cName) || cairo_dock_strings_differ (pConcernedIcon->cFileName, pNewIcon->cFileName))
170
170
                        {
171
 
                                g_print (" '%s' -> '%s'\n'%s' -> '%s'\n", pConcernedIcon->cName, pNewIcon->cName, pConcernedIcon->cFileName, pNewIcon->cFileName);
 
171
                                //g_print (" '%s' -> '%s'\n'%s' -> '%s'\n", pConcernedIcon->cName, pNewIcon->cName, pConcernedIcon->cFileName, pNewIcon->cFileName);
172
172
                                
173
173
                                CD_APPLET_REMOVE_ICON_FROM_MY_ICONS_LIST (pConcernedIcon);
174
174