/*
- * Copyright (c) 2011-2014, JANET(UK)
+ * Copyright (c) 2011-2016, JANET(UK)
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
private MoonshotServer ipc_server;
private bool name_is_owned;
private bool show_requested;
+ public bool use_flat_file_store {public get; private set;}
+ public bool headless {public get; private set;}
#if OS_MACOS
public OSXApplication osxApp;
}
#endif
- private const int WINDOW_WIDTH = 400;
- private const int WINDOW_HEIGHT = 500;
-
-
/** If we're successfully registered with DBus, then show the UI. Otherwise, wait until we're registered. */
public void show() {
if (name_is_owned) {
}
}
-#if LOG4VALA
+#if USE_LOG4VALA
// Call this from main() to ensure that the logger is initialized
internal IdentityManagerApp.dummy() {}
#endif
public IdentityManagerApp(bool headless, bool use_flat_file_store) {
+ this.headless = headless;
+
use_flat_file_store |= UserForcesFlatFileStore();
+ this.use_flat_file_store = use_flat_file_store;
#if GNOME_KEYRING
bool keyring_available = (!use_flat_file_store) && GnomeKeyring.is_available();
model.set_store_type(IIdentityCardStore.StoreType.KEYRING);
if (!headless)
- view = new IdentityManagerView(this);
+ view = new IdentityManagerView(this, use_flat_file_store);
LinkedList<IdCard> card_list = model.get_card_list();
if (card_list.size > 0)
this.default_id_card = card_list.last();
#endif
}
- public bool add_identity(IdCard id, bool force_flat_file_store) {
- if (view != null) return view.add_identity(id, force_flat_file_store);
- model.add_card(id, force_flat_file_store);
- return true;
+ public bool add_identity(IdCard id, bool force_flat_file_store, out ArrayList<IdCard>? old_duplicates=null) {
+ if (view != null)
+ {
+ logger.trace("add_identity: calling view.add_identity");
+ return view.add_identity(id, force_flat_file_store, out old_duplicates);
+ }
+ else {
+ logger.trace("add_identity: calling model.add_card");
+ model.add_card(id, force_flat_file_store, out old_duplicates);
+ return true;
+ }
}
public void select_identity(IdentityRequest request) {
- logger.trace("select_identity");
+ logger.trace("select_identity: request.nai=%s".printf(request.nai ?? "[null]"));
IdCard identity = null;
/* If NAI matches, use this id card */
if (has_nai && request.nai == id.nai)
{
+ logger.trace("select_identity: request has nai; returning " + id.display_name);
identity = id;
break;
}
/* If any service matches we add id card to the candidate list */
if (has_srv)
{
- foreach (string srv in id.services)
- {
- if (request.service == srv)
- {
- request.candidates.append(id);
- continue;
- }
+ if (id.services.contains(request.service)) {
+ logger.trace(@"select_identity: request has service '$(request.service); matched on '$(id.display_name)'");
+ request.candidates.append(id);
}
}
}
/* If more than one candidate we dissasociate service from all ids */
if ((identity == null) && has_srv && request.candidates.length() > 1)
{
+ logger.trace(@"select_identity: multiple candidates; removing service '$(request.service) from all.");
foreach (IdCard id in request.candidates)
{
- int i = 0;
- SList<string> services_list = null;
- bool has_service = false;
-
- foreach (string srv in id.services)
- {
- if (srv == request.service)
- {
- has_service = true;
- continue;
- }
- services_list.append(srv);
- }
-
- if (!has_service)
- continue;
-
- if (services_list.length() == 0)
- {
- id.services = {};
- continue;
- }
-
- string[] services = new string[services_list.length()];
- foreach (string srv in services_list)
- {
- services[i] = srv;
- i++;
- }
-
- id.services = services;
+ id.services.remove(request.service);
}
}
/* If there are no candidates we use the service matching rules */
if ((identity == null) && (request.candidates.length() == 0))
{
+ logger.trace("select_identity: No candidates; using service matching rules.");
foreach (IdCard id in model.get_card_list())
{
foreach (Rule rule in id.rules)
if (!match_service_pattern(request.service, rule.pattern))
continue;
+ logger.trace(@"select_identity: ID $(id.display_name) matched on service matching rules.");
request.candidates.append(id);
if (rule.always_confirm == "true")
}
if ((identity == null) && has_nai) {
+ logger.trace("select_identity: Creating temp identity");
// create a temp identity
string[] components = request.nai.split("@", 2);
identity = new IdCard();
if (!shown) {
GLib.error("Couldn't own name org.janet.Moonshot on dbus or show previously launched identity manager.");
} else {
- stdout.printf("Showed previously launched identity manager.\n");
+ stdout.printf(_("Showed previously launched identity manager.\n"));
GLib.Process.exit(0);
}
}
"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");
public static int main(string[] args) {
-#if LOG4VALA
+#if USE_LOG4VALA
+ // Initialize the logger.
new IdentityManagerApp.dummy();
#endif
settings.set_long_property("gtk-menu-images", 0, "moonshot");
#endif
+ //TODO?? Do we need to call Intl.setlocale(LocaleCategory.MESSAGES, "");
Intl.bindtextdomain(Config.GETTEXT_PACKAGE, Config.LOCALEDIR);
Intl.bind_textdomain_codeset(Config.GETTEXT_PACKAGE, "UTF-8");
Intl.textdomain(Config.GETTEXT_PACKAGE);
projects / moonshot-ui.git / blobdiff