removed support of appindicator <3.0

[psensor.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index f5c0f2a..e9ac03f 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -104,9 +104,6 @@ static void print_help()
 "  -u, --url=URL       the URL of the psensor-server,\n"
 "                      example: http://hostname:3131"));
        puts(_(
-"  --use-libatasmart   use atasmart library for disk monitoring instead of\n"
-"                      hddtemp daemon"));
-       puts(_(
 "  -n, --new-instance  force the creation of a new Psensor application"));
        puts("");
 
@@ -157,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);
@@ -207,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
@@ -266,29 +261,47 @@ static void cb_alarm_raised(struct psensor *sensor, void *data)
 
 static void associate_colors(struct psensor **sensors)
 {
-       /* number of uniq colors */
-#define COLORS_COUNT 8
-
-       double colors[COLORS_COUNT][3] = {
-               {0, 0, 0},      /* black */
-               {1, 0, 0},      /* red */
-               {0, 0, 1},      /* blue */
-               {0, 1, 0},      /* green */
-
-               {0.5, 0.5, 0.5},/* grey */
-               {0.5, 0, 0},    /* dark red */
-               {0, 0, 0.5},    /* dark blue */
-               {0, 0.5, 0}     /* dark green */
+       GdkRGBA rgba;
+       /* copied from the default colors of the gtk color color
+        * chooser. */
+       const char *default_colors[27] = {
+               "#ef2929",  /* Scarlet Red */
+               "#fcaf3e",  /* Orange */
+               "#fce94f",  /* Butter */
+               "#8ae234",  /* Chameleon */
+               "#729fcf",  /* Sky Blue */
+               "#ad7fa8",  /* Plum */
+               "#e9b96e",  /* Chocolate */
+               "#888a85",  /* Aluminum 1 */
+               "#eeeeec",  /* Aluminum 2 */
+               "#cc0000",
+               "#f57900",
+               "#edd400",
+               "#73d216",
+               "#3465a4",
+               "#75507b",
+               "#c17d11",
+               "#555753",
+               "#d3d7cf",
+               "#a40000",
+               "#ce5c00",
+               "#c4a000",
+               "#4e9a06",
+               "#204a87",
+               "#5c3566",
+               "#8f5902",
+               "#2e3436",
+               "#babdb6"
        };
-       struct psensor **cur;
        int i;
+       struct psensor **cur;
        struct color c;
 
        for (cur = sensors, i = 0; *cur; cur++, i++) {
-               color_set(&c,
-                         colors[i % COLORS_COUNT][0],
-                         colors[i % COLORS_COUNT][1],
-                         colors[i % COLORS_COUNT][2]);
+               gdk_rgba_parse(&rgba, default_colors[i % 27]);
+               c.red = rgba.red;
+               c.green = rgba.green;
+               c.blue = rgba.blue;
 
                (*cur)->color = config_get_sensor_color((*cur)->id, &c);
        }
@@ -359,7 +372,6 @@ static void log_init()
 }
 
 static struct option long_options[] = {
-       {"use-libatasmart", no_argument, 0, 0},
        {"version", no_argument, 0, 'v'},
        {"help", no_argument, 0, 'h'},
        {"url", required_argument, 0, 'u'},
@@ -418,8 +430,6 @@ static void cleanup(struct ui_psensor *ui)
 
        log_debug("Cleanup...");
 
-       psensor_cleanup();
-
 #ifdef HAVE_NVIDIA
        nvidia_cleanup();
 #endif
@@ -433,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
 
@@ -579,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);
 
@@ -607,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
@@ -626,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