← Back to branch summary

~ubuntu-branches/ubuntu/utopic/xfce4-power-manager/utopic-proposed

« back to all changes in this revision

Viewing changes to .pc/04_clear-idles-for-removed-batteries.patch/src/xfpm-battery.c

  • Committer: Package Import Robot
  • Author(s): Lionel Le Folgoc
  • Date: 2012-04-03 22:15:05 UTC
  • mfrom: (2.3.8)
  • Revision ID: package-import@ubuntu.com-20120403221505-2dvza7w2d97zb7qn
Tags: 1.0.11-0ubuntu1
* New upstream bugfix release.
* debian/patches:
  - 0001-Solaris-specific-code-for-determining-the-start-time.patch,
    02_fix-notify-detect.patch,
    07_fix_broken_empty_icon_battery.patch: dropped, included upstream.
  - xubuntu_fix-status-icon-other-devices.patch: refreshed to apply cleanly.

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/04_clear-idles-for-removed-batteries.patch/src/xfpm-battery.c
219
219
                    
220
220
                    est_time_str = xfpm_battery_get_time_string (battery->priv->time_to_full);
221
221
                    
222
 
                    msg = g_strdup_printf ("%s (%i%%)\n%s until is fully charged.", tmp, battery->priv->percentage, est_time_str);
 
222
                    msg = g_strdup_printf (_("%s (%i%%)\n%s until is fully charged."), tmp, battery->priv->percentage, est_time_str);
223
223
                    g_free (est_time_str);
224
224
                    g_free (tmp);
225
225
                }
239
239
                        
240
240
                        est_time_str = xfpm_battery_get_time_string (battery->priv->time_to_empty);
241
241
                        
242
 
                        msg = g_strdup_printf ("%s (%i%%)\nEstimated time left is %s.", tmp, battery->priv->percentage, est_time_str);
 
242
                        msg = g_strdup_printf (_("%s (%i%%)\nEstimated time left is %s."), tmp, battery->priv->percentage, est_time_str);
243
243
                        g_free (tmp);
244
244
                        g_free (est_time_str);
245
245
                    }
309
309
                        battery->priv->icon_prefix, 
310
310
                        xfpm_battery_get_icon_index (battery->priv->type, battery->priv->percentage));
311
311
        }
 
312
        else if ( battery->priv->state == XFPM_DEVICE_STATE_EMPTY)
 
313
        {
 
314
            g_snprintf (icon_name, 128, "%s%s", battery->priv->icon_prefix, battery->priv->ac_online ? "000-charging" : "000");
 
315
        }
312
316
    }
313
317
    else
314
318
    {
315
 
        if ( !battery->priv->present )
 
319
        if ( !battery->priv->present || battery->priv->state == XFPM_DEVICE_STATE_EMPTY )
316
320
        {
317
321
            g_snprintf (icon_name, 128, "%s-000", battery->priv->icon_prefix);
318
322
        }