"org.janet.Moonshot",
GLib.BusNameOwnerFlags.NONE,
bus_acquired_cb,
- (conn, name) => {logger.trace("init_ipc_server: name_acquired_closure");},
+ (conn, name) => {logger.trace("init_ipc_server: name_acquired_closure; conn=" + (conn==null?"null":"non-null"));},
(conn, name) => {
- logger.trace("init_ipc_server: name_lost_closure");
+ logger.trace("init_ipc_server: name_lost_closure; conn=" + (conn==null?"null":"non-null"));
bool shown=false;
try {
IIdentityManager manager = Bus.get_proxy_sync (BusType.SESSION, name, "/org/janet/moonshot");
private void init_ipc_server() {
this.ipc_server = new MoonshotServer(this);
bool shown = false;
+ var our_name = "org.janet.Moonshot";
GLib.Bus.own_name(GLib.BusType.SESSION,
- "org.janet.Moonshot",
+ our_name,
GLib.BusNameOwnerFlags.NONE,
bus_acquired_cb,
// Name acquired callback:
(conn, name) => {
- logger.trace(@"init_ipc_server: name_acquired_closure; show_requested=$show_requested");
+ logger.trace(@"init_ipc_server: name_acquired_closure; show_requested=$show_requested; conn="
+ + (conn==null?"null":"non-null; name='" + name + "'"));
name_is_owned = true;
},
// Name lost callback:
- (conn, name) => {
+ () => {
logger.trace("init_ipc_server: name_lost_closure");
// This callback usually means that another moonshot is already running.
try {
if (!shown) {
- IIdentityManager manager = Bus.get_proxy_sync(BusType.SESSION, name, "/org/janet/moonshot");
+ IIdentityManager manager = Bus.get_proxy_sync(BusType.SESSION, our_name, "/org/janet/moonshot");
shown = manager.show_ui();
}
} catch (IOError e) {
logger.error("init_ipc_server.name_lost_closure: Caught IOError: " + e.message);
}
if (!shown) {
- logger.error("init_ipc_server.name_lost_closure: Couldn't own name %s on dbus or show previously launched identity manager".printf(name));
- GLib.error("Couldn't own name %s on dbus or show previously launched identity manager.", name);
+ logger.error("init_ipc_server.name_lost_closure: Couldn't own name '%s' on dbus or show previously launched identity manager".printf(our_name));
+ GLib.error("Couldn't own name '%s' on dbus or show previously launched identity manager.", our_name);
} else {
logger.trace("init_ipc_server.name_lost_closure: Showed previously launched identity manager.");
stdout.printf("Showed previously launched identity manager.\n");
key_file.load_from_file(filename, KeyFileFlags.NONE);
}
catch (Error e) {
- stdout.printf("Error: %s\n", e.message);
+ stdout.printf("Error while attempting to load from %s: %s\n", filename, e.message);
return;
}
id_card_list.add(id_card);
}
catch (Error e) {
- logger.error("load_id_cards: Error while loading keyfile: %s\n".printf(e.message));
- stdout.printf("Error: %s\n", e.message);
+ logger.error("load_id_cards: Error while loading keyfile %s: %s\n".printf(filename, e.message));
+ stdout.printf("Error while attempting to load from %s: %s\n", filename, e.message);
}
}
}
static void glib_default_log_handler(string? log_domain, LogLevelFlags log_level, string message)
{
Log4Vala.Logger logger = Log4Vala.Logger.get_logger(log_domain ?? "Glib");
- stderr.printf(log_level.to_string() + " : " + message + "\n");
- logger.error("Glib error level: " + log_level.to_string() + " : " + message);
+ stderr.printf(log_level.to_string() + " : " + message ?? "" + "\n");
+ logger.error("Glib error level: " + log_level.to_string() + " : " + (message ?? ""));
}
/** Logger class that wraps the Log4Vala logger */