X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fui_appindicator.c;h=a396f655828ec21a5540f4a8cef812c94f381eb0;hb=c4c838efcc14cd46807052fa0303f4ba6df48e5f;hp=c25e270be4e78e858d95298647e7db0702b85f81;hpb=8a3d16ade26321374c684080d627cf12ba71e598;p=psensor.git

diff --git a/src/ui_appindicator.c b/src/ui_appindicator.c
index c25e270..a396f65 100644
--- a/src/ui_appindicator.c
+++ b/src/ui_appindicator.c
@@ -34,44 +34,31 @@
 static const char *ICON = "psensor_normal";
 static const char *ATTENTION_ICON = "psensor_hot";
 
+static const char *GLADE_FILE
+= PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "psensor-appindicator.glade";
+
 static struct psensor **sensors;
 static GtkMenuItem **menu_items;
-static int appindicator_supported = 1;
+static bool appindicator_supported = true;
 static AppIndicator *indicator;
 static struct ui_psensor *ui_psensor;
 
-void cb_menu_show(GtkMenuItem *mi, gpointer data)
+void ui_appindicator_menu_show_cb(GtkMenuItem *mi, gpointer data)
 {
 	ui_window_show((struct ui_psensor *)data);
 }
 
 void ui_appindicator_cb_preferences(GtkMenuItem *mi, gpointer data)
 {
-#ifdef HAVE_APPINDICATOR_029
-	gdk_threads_enter();
-#endif
-
 	ui_pref_dialog_run((struct ui_psensor *)data);
-
-#ifdef HAVE_APPINDICATOR_029
-	gdk_threads_leave();
-#endif
 }
 
 void ui_appindicator_cb_sensor_preferences(GtkMenuItem *mi, gpointer data)
 {
 	struct ui_psensor *ui = data;
 
-#ifdef HAVE_APPINDICATOR_029
-	gdk_threads_enter();
-#endif
-
 	if (ui->sensors && *ui->sensors)
 		ui_sensorpref_dialog_run(*ui->sensors, ui);
-
-#ifdef HAVE_APPINDICATOR_029
-	gdk_threads_leave();
-#endif
 }
 
 static void
@@ -147,16 +134,20 @@ static GtkWidget *get_menu(struct ui_psensor *ui)
 	guint ok;
 	GtkBuilder *builder;
 
+	log_fct_enter();
+
 	builder = gtk_builder_new();
 
 	error = NULL;
 	ok = gtk_builder_add_from_file
-		(builder,
-		 PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "psensor.glade",
-		 &error);
+	(builder,
+	 GLADE_FILE,
+	 &error);
 
 	if (!ok) {
-		log_printf(LOG_ERR, error->message);
+		log_err(_("Failed to load glade file %s: %s"),
+			GLADE_FILE,
+			error->message);
 		g_error_free(error);
 		return NULL;
 	}
@@ -168,6 +159,8 @@ static GtkWidget *get_menu(struct ui_psensor *ui)
 	g_object_ref(G_OBJECT(menu));
 	g_object_unref(G_OBJECT(builder));
 
+	log_fct_exit();
+
 	return GTK_WIDGET(menu);
 }
 
@@ -251,7 +244,7 @@ static GtkStatusIcon *unity_fallback(AppIndicator *indicator)
 
 	log_debug("ui_appindicator.unity_fallback()");
 
-	appindicator_supported = 0;
+	appindicator_supported = false;
 
 	ico = ui_status_get_icon(ui_psensor);
 
@@ -267,7 +260,7 @@ unity_unfallback(AppIndicator *indicator, GtkStatusIcon *status_icon)
 
 	ui_status_set_visible(0);
 
-	appindicator_supported = 1;
+	appindicator_supported = true;
 }
 
 void ui_appindicator_update_menu(struct ui_psensor *ui)
@@ -298,12 +291,12 @@ void ui_appindicator_init(struct ui_psensor *ui)
 	ui_appindicator_update_menu(ui);
 }
 
-int is_appindicator_supported()
+bool is_appindicator_supported(void)
 {
 	return appindicator_supported;
 }
 
-void ui_appindicator_cleanup()
+void ui_appindicator_cleanup(void)
 {
 	free(sensors);
 }