removed support of appindicator <3.0

[psensor.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 073132a..e9ac03f 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -154,8 +154,6 @@ static void *update_measures(void *data)
 
                update_psensor_values_size(sensors, cfg);
 
-               psensor_list_update_measures(sensors);
-
                lmsensor_psensor_list_update(sensors);
 #ifdef HAVE_REMOTE_SUPPORT
                remote_psensor_list_update(sensors);
@@ -204,7 +202,7 @@ static void indicators_update(struct ui_psensor *ui)
                sensor_cur++;
        }
 
-#if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029)
+#if defined(HAVE_APPINDICATOR)
        if (is_appindicator_supported())
                ui_appindicator_update(ui, attention);
 #endif
@@ -432,8 +430,6 @@ static void cleanup(struct ui_psensor *ui)
 
        log_debug("Cleanup...");
 
-       psensor_cleanup();
-
 #ifdef HAVE_NVIDIA
        nvidia_cleanup();
 #endif
@@ -447,7 +443,7 @@ static void cleanup(struct ui_psensor *ui)
        psensor_list_free(ui->sensors);
        ui->sensors = NULL;
 
-#if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029)
+#if defined(HAVE_APPINDICATOR)
        ui_appindicator_cleanup();
 #endif
 
@@ -593,25 +589,12 @@ int main(int argc, char **argv)
        g_thread_init(NULL);
 #endif
 
-#ifdef HAVE_APPINDICATOR_029
-       /* gdk_thread_enter/leave only used to workaround mutex bug
-        * of appindicator < 0.2.9, so do not call gdk_threads_init
-        * if useless. Calling this function leads to
-        * crash "Attempt to unlock mutex that was not locked" with
-        * GLib 2.41.2 (new checking) probably due to bugs in GTK
-        * itself.
-        */
-       gdk_threads_init();
-#endif
-
        gtk_init(NULL, NULL);
 
        pmutex_init(&ui.sensors_mutex);
 
        ui.config = config_load();
 
-       psensor_init();
-
        ui.sensors = create_sensors_list(url);
        associate_cb_alarm_raised(ui.sensors, &ui);
 
@@ -621,7 +604,7 @@ int main(int argc, char **argv)
                              &ui.sensors_mutex,
                              config_get_slog_interval());
 
-#if !defined(HAVE_APPINDICATOR) && !defined(HAVE_APPINDICATOR_029)
+#if !defined(HAVE_APPINDICATOR)
        ui_status_init(&ui);
        ui_status_set_visible(1);
 #endif
@@ -640,7 +623,7 @@ int main(int argc, char **argv)
 
        g_timeout_add(1000 * ui.graph_update_interval, ui_refresh_thread, &ui);
 
-#if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029)
+#if defined(HAVE_APPINDICATOR)
        ui_appindicator_init(&ui);
 #endif