← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/cairo-dock-plug-ins/oneiric-proposed

« back to all changes in this revision

Viewing changes to shortcuts/src/applet-bookmarks.c

  • Committer: Bazaar Package Importer
  • Author(s): Matthieu Baerts (matttbe)
  • Date: 2011-04-20 20:46:51 UTC
  • mfrom: (1.1.9 upstream)
  • Revision ID: james.westby@ubuntu.com-20110420204651-ftnpzesj6uc7qeul
Tags: 2.3.0~1-0ubuntu1
https://launchpad.net/bugs/723995
* New Upstream Version (LP: #723995)
* Upstream short ChangeLog (since 2.3.0~0rc1):
 - Updated translations
 - Updated the integration of the new versions of kwin and compiz
    (Switcher, ShowDesktop, etc.)
 - Removed a lot of useless g_print
 - Updated a few plug-ins to fit with the new version of the API (gldit)
 - Fixed a few bugs
 - Updated MeMenu, MessagingMenu and Status-Notifier to works
    with the latest version of dbusmenu, etc.
* Switch to dpkg-source 3.0 (quilt) format
* debian/cairo-dock-plug-ins.install:
 - Added new files (interfaces for python, ruby, vala and mono)
* debian/control:
 - Added new dependences for new applets (sensors and zeitgeist)
    and new interfaces (python, valac, ruby and mono)
 - Updated the version of cairo-dock build-dependences
* debian/rules:
 - Added a new CMake flag to install python interface in debian/tmp
* Updated debian/watch

Show diffs side-by-side

added added

removed removed

Lines of Context:
shortcuts/src/applet-bookmarks.c
138
138
                                                        cRealURI,
139
139
                                                        NULL,
140
140
                                                        0);
141
 
                                                pNewIcon->iType = CD_BOOKMARK_GROUP;
 
141
                                                pNewIcon->iGroup = CD_BOOKMARK_GROUP;
142
142
                                                pNewIcon->cBaseURI = cOneBookmark;
143
143
                                                pNewIcon->iVolumeID = iVolumeID;
144
144
                                                pNewIcon->iLastCheckTime = iTime;
168
168
                                for (ic = pIconsList; ic != NULL; ic = ic->next)
169
169
                                {
170
170
                                        icon = ic->data;
171
 
                                        if (icon->iType == CD_BOOKMARK_GROUP)
 
171
                                        if (icon->iGroup == CD_BOOKMARK_GROUP)
172
172
                                        {
173
173
                                                if (icon->iLastCheckTime != iTime)
174
174
                                                {
398
398
                                        cRealURI,
399
399
                                        NULL,
400
400
                                        fCurrentOrder ++);
401
 
                                pNewIcon->iType = CD_BOOKMARK_GROUP;
 
401
                                pNewIcon->iGroup = CD_BOOKMARK_GROUP;
402
402
                                pNewIcon->cBaseURI = cOneBookmark;
403
403
                                pNewIcon->iVolumeID = iVolumeID;
404
404
                                pBookmarkIconList = g_list_append (pBookmarkIconList, pNewIcon);