← Back to branch summary

~ubuntu-branches/ubuntu/vivid/cairo-dock-plug-ins/vivid

« back to all changes in this revision

Viewing changes to System-Monitor/src/applet-rame.c

  • Committer: Matthieu Baerts
  • Date: 2013-08-27 14:46:47 UTC
  • mto: (53.1.4 cairo-dock-plug-ins)
  • mto: This revision was merged to the branch mainline in revision 44.
  • Revision ID: matttbe@gmail.com-20130827144647-wm0kyawa8vcg0cso
Tags: upstream-3.2.99.beta1.1~20130827~bzr2928
Import upstream version 3.2.99.beta1.1~20130827~bzr2928

Show diffs side-by-side

added added

removed removed

Lines of Context:
System-Monitor/src/applet-rame.c
49
49
        while (*str == ' ') \
50
50
                str ++; \
51
51
        iValue = atoll (str);
52
 
void cd_sysmonitor_get_ram_data (CairoDockModuleInstance *myApplet)
 
52
void cd_sysmonitor_get_ram_data (GldiModuleInstance *myApplet)
53
53
{
54
54
        gchar *cContent = NULL;
55
55
        gsize length=0;
123
123
#define _unit(s) (((s >> 20) == 0) ? D_("Mb") : D_("Gb"))
124
124
#define _append_value_from_kb(pInfo, s) t = _convert_from_kb (s); g_string_append_printf (pInfo, t<10 ? "%.1f" : "%.0f", t); g_string_append (pInfo, _unit(s));
125
125
 
126
 
void cd_sysmonitor_get_ram_info (CairoDockModuleInstance *myApplet, GString *pInfo)
 
126
void cd_sysmonitor_get_ram_info (GldiModuleInstance *myApplet, GString *pInfo)
127
127
{
128
128
        if (!myConfig.bShowRam && ! myConfig.bShowSwap)
129
129
                cd_sysmonitor_get_ram_data (myApplet);  // le thread ne passe pas par la => pas de conflit.