diff options
| author | Monsta <[email protected]> | 2014-12-30 15:56:43 +0300 |
|---|---|---|
| committer | infirit <[email protected]> | 2014-12-30 14:59:32 +0100 |
| commit | 746aedb7c45aabe9aacf8b29bf4b393bcd83c7a4 (patch) | |
| tree | 44f8b7ea74f646f655bf1fb9cda6be4732ec565d /battstat/battstat_applet.c | |
| parent | 2dcb73c54833ae6af9fd724d40fdbfdbf16296f8 (diff) | |
| download | mate-applets-746aedb7c45aabe9aacf8b29bf4b393bcd83c7a4.tar.bz2 mate-applets-746aedb7c45aabe9aacf8b29bf4b393bcd83c7a4.tar.xz | |
battstat applet: remove HAL support
Diffstat (limited to 'battstat/battstat_applet.c')
| -rw-r--r-- | battstat/battstat_applet.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/battstat/battstat_applet.c b/battstat/battstat_applet.c index 16216a9b..a14bfe71 100644 --- a/battstat/battstat_applet.c +++ b/battstat/battstat_applet.c @@ -278,7 +278,7 @@ status_change_callback (void) it does.) */ static const char * -static_global_initialisation (int no_hal, ProgressData *battstat) +static_global_initialisation (ProgressData *battstat) { gboolean first_time; const char *err; @@ -291,7 +291,7 @@ static_global_initialisation (int no_hal, ProgressData *battstat) return NULL; initialise_global_pixmaps(); - err = power_management_initialise (no_hal, status_change_callback); + err = power_management_initialise (status_change_callback); return err; } @@ -1200,10 +1200,8 @@ about_cb( GtkAction *action, ProgressData *battstat ) char *comments = g_strdup_printf ("%s\n\n%s", _("This utility shows the status of your laptop battery."), power_management_using_upower () ? - /* ture */ _("upower backend enabled.") : - (power_management_using_hal () ? - /* true */ _("HAL backend enabled.") : - /* false */ _("Legacy (non-HAL) backend enabled."))); + /* true */ _("upower backend enabled.") : + /* false */ _("Legacy backend enabled.")); mate_show_about_dialog( NULL, "version", VERSION, @@ -1574,7 +1572,6 @@ battstat_applet_fill (MatePanelApplet *applet) GtkActionGroup *action_group; gchar *ui_path; const char *err; - int no_hal; if (DEBUG) g_print("main()\n"); @@ -1634,9 +1631,7 @@ battstat_applet_fill (MatePanelApplet *applet) atk_object_set_description(atk_widget, _("Monitor a laptop's remaining power")); } - no_hal = g_settings_get_boolean (battstat->settings, "no-hal"); - - if ((err = static_global_initialisation (no_hal, battstat))) + if ((err = static_global_initialisation (battstat))) battstat_error_dialog (GTK_WIDGET (applet), err); return TRUE; |