← Back to branch summary

~cairo-dock-team/ubuntu/precise/cairo-dock-plug-ins/3.0.0.0rc1

« back to all changes in this revision

Viewing changes to Disks/src/applet-config.c

  • Committer: Matthieu Baerts
  • Date: 2011-08-09 19:51:45 UTC
  • mfrom: (1.1.12 upstream)
  • mto: This revision was merged to the branch mainline in revision 21.
  • Revision ID: matttbe@gmail.com-20110809195145-6t55jtykipujuyn5
https://launchpad.net/bugs/811579
https://launchpad.net/bugs/823514
* New upstream release. (LP: #823514)
* Upstream (short) ChangeLog:
 - The Power-Manager applet has been rewritten to work on any plateform.
 - Compiz-icon applet has been replaced by Composite-Manager.
 - Improved integration in the XFCE, LXDE and GNOME3 desktop.
 - Logout is now working even if there is no/an unknow session manager.
 - Several new DBus methods lets you interact on the dock more easily.
 - Added the possibility to shutdown/logout with GMenu.
 - Improved Status-Notifier and added its own watcher.
 - Added a new applet: Impulse (still need testing).
 - Fixed a few bugs as usual.
* debian/patches:
 - Removed all patches (they was already unapplied).
* debian/copyright:
 - Updated with new files/directory.
* debian/cairo-dock-plug-ins.install:
 - Added status-notifier-watcher used by Status-Notifier applet.
* debian/control:
 - Updated the version of cairo-dock-[core;data;dev].
 - Bump Standard-Version to 3.9.2.
 - Added fftw3, pulse (Impulse) and upower-glib (Logout)
    as new dependences for the build process.
 - Added indicator-[me;messages] as new recommendations
    for cairo-dock-plug-ins (needed for [Me;Messaging]Menu applets).
 - Removed gawk from the build dependences list (no longer needed).
* cairo-dock-plug-ins package needs to be recompiled (LP: #811579)

Show diffs side-by-side

added added

removed removed

Lines of Context:
Disks/src/applet-config.c
23
23
 
24
24
#include "applet-struct.h"
25
25
#include "applet-config.h"
 
26
#include "applet-disks.h"
26
27
 
27
28
 
28
29
CD_APPLET_GET_CONFIG_BEGIN
49
50
 
50
51
        ///\_________________ Parameters
51
52
        myConfig.cDisks = CD_CONFIG_GET_STRING_LIST ("Configuration", "disks", &myConfig.iNumberDisks);
 
53
        myConfig.cParts = CD_CONFIG_GET_STRING_LIST ("Configuration", "partitions", &myConfig.iNumberParts);
52
54
        myConfig.cSystemMonitorCommand = CD_CONFIG_GET_STRING ("Configuration", "sys monitor");
53
55
CD_APPLET_GET_CONFIG_END
54
56
 
72
74
        
73
75
        g_timer_destroy (myData.pClock);
74
76
        
75
 
        reset_disks_list (myApplet);
 
77
        cd_disks_reset_parts_list (myApplet);
 
78
        cd_disks_reset_disks_list (myApplet);
76
79
CD_APPLET_RESET_DATA_END
77
 
 
78
 
 
79
 
void reset_disks_list (CairoDockModuleInstance *myApplet)
80
 
{
81
 
        if (myData.iNumberDisks > 0)
82
 
        {
83
 
                gsize i;
84
 
                CDDiskSpeedData *pSpeed;
85
 
                for (i = 0; i < myData.iNumberDisks; i++)
86
 
                {
87
 
                        pSpeed = g_list_nth_data (myData.lDisks, i);  /// maladroit
88
 
                        if (pSpeed != NULL) 
89
 
                        {
90
 
                                if (pSpeed->cName != NULL)
91
 
                                        g_free (pSpeed->cName);
92
 
                                g_free (pSpeed);
93
 
                        }
94
 
                }
95
 
                g_list_free (myData.lDisks);
96
 
                myData.lDisks = NULL;
97
 
        }
98
 
}