X-Git-Url: http://git.wpitchoune.net/gitweb/?p=psensor.git;a=blobdiff_plain;f=src%2Fui_appindicator.c;h=f9f1a598d847f8b2abec01639e0405419f196540;hp=5fbbb8b1cca189b092dfaf5579f79b0b73aa689f;hb=bf8b896c257cd142668525369508f8d9135ff0f5;hpb=fa18cf0ee422c79f2df4ec530e833208ce8b04f7 diff --git a/src/ui_appindicator.c b/src/ui_appindicator.c index 5fbbb8b..f9f1a59 100644 --- a/src/ui_appindicator.c +++ b/src/ui_appindicator.c @@ -40,7 +40,7 @@ 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); } @@ -131,16 +131,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, + PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "psensor-appindicator.glade", + &error); if (!ok) { - log_printf(LOG_ERR, error->message); + log_err(_("Failed to load glade file %s: %s"), + PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "psensor-appindicator.glade", + error->message); g_error_free(error); return NULL; } @@ -152,6 +156,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); }