}
public IdentityManagerApp (bool headless, bool use_flat_file_store) {
+ use_flat_file_store |= UserForcesFlatFileStore();
#if GNOME_KEYRING
- bool keyring_available = GnomeKeyring.is_available();
+ bool keyring_available = (!use_flat_file_store) && GnomeKeyring.is_available();
#else
bool keyring_available = false;
#endif
view = new IdentityManagerView(this);
LinkedList<IdCard> card_list = model.get_card_list() ;
if (card_list.size > 0)
- this.default_id_card = card_list.first();
+ this.default_id_card = card_list.last();
init_ipc_server ();
bool has_nai = request.nai != null && request.nai != "";
bool has_srv = request.service != null && request.service != "";
bool confirm = false;
- IdCard nai_provided = null;
foreach (IdCard id in model.get_card_list())
{
- /* If NAI matches we add id card to the candidate list */
+ /* If NAI matches, use this id card */
if (has_nai && request.nai == id.nai)
{
- nai_provided = id;
- request.candidates.append (id);
- continue;
+ identity = id;
+ break;
}
/* If any service matches we add id card to the candidate list */
}
/* If more than one candidate we dissasociate service from all ids */
- if (has_srv && request.candidates.length() > 1)
+ if ((identity == null) && has_srv && request.candidates.length() > 1)
{
foreach (IdCard id in request.candidates)
{
}
}
-// model.store_id_cards ();
-
/* If there are no candidates we use the service matching rules */
- if (request.candidates.length () == 0)
+ if ((identity==null) && (request.candidates.length () == 0))
{
foreach (IdCard id in model.get_card_list())
{
}
}
- if (request.candidates.length () > 1)
- {
- if (has_nai && nai_provided != null)
- {
- identity = nai_provided;
- confirm = false;
- }
- else
+ if ((identity == null) && has_nai) {
+ // create a temp identity
+ string[] components = request.nai.split("@", 2);
+ identity = new IdCard();
+ identity.display_name = request.nai;
+ identity.username = components[0];
+ if (components.length > 1)
+ identity.issuer = components[1];
+ identity.password = request.password;
+ identity.temporary = true;
+ }
+ if (identity == null) {
+ if (request.candidates.length () != 1) {
confirm = true;
+ } else {
+ identity = request.candidates.nth_data (0);
+ }
}
- if (identity == null)
- identity = request.candidates.nth_data (0);
- if (identity == null)
- confirm = true;
- /* TODO: If candidate list empty return fail */
-
if (confirm && (view != null))
{
if (!explicitly_launched)
Idle.add(
() => {
if (view != null) {
- view.check_add_password(identity, request, model);
+ identity = view.check_add_password(identity, request, model);
}
request.return_identity (identity);
// The following occasionally causes the app to exit without sending the dbus
#endif
if (headless) {
+ try {
+ var opt_context = new OptionContext(null);
+ opt_context.set_help_enabled (true);
+ opt_context.add_main_entries (options, null);
+ opt_context.parse(ref args);
+ } catch (OptionError e) {
+ stdout.printf(_("error: %s\n"),e.message);
+ stdout.printf(_("Run '%s --help' to see a full list of available options\n"), args[0]);
+ return -1;
+ }
explicitly_launched = false;
} else {
try {
- Gtk.init_with_args(ref args, _(""), options, null);
+ if (!Gtk.init_with_args(ref args, _(""), options, null)) {
+ stdout.printf(_("unable to initialize window\n"));
+ return -1;
+ }
} catch (GLib.Error e) {
stdout.printf(_("error: %s\n"),e.message);
- stdout.printf(_("Run '%s --help' to see a full list of available options"), args[0]);
+ stdout.printf(_("Run '%s --help' to see a full list of available options\n"), args[0]);
+ return -1;
}
+ gtk_available = true;
}
#if OS_WIN32