X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=inline;f=shell%2Fev-password.c;h=b6298f38493b22763e9ef561a5ad3367822ceff3;hb=e02e3fde2610db645a005f276286795025426186;hp=4dc312dfb2d3fbcd9f58d101e52fe128988722d4;hpb=e53e8a7ba14b5156d41e84d56cab85cbe195e344;p=evince.git diff --git a/shell/ev-password.c b/shell/ev-password.c index 4dc312df..b6298f38 100644 --- a/shell/ev-password.c +++ b/shell/ev-password.c @@ -81,7 +81,7 @@ ev_password_dialog_set_property (GObject *object, base_name = g_path_get_basename (file_name); format = g_strdup_printf ("%s\n\n%s", _("Password required"), - _("The document %s is locked and requires a password before it can be opened.")); + _("The document “%s” is locked and requires a password before it can be opened.")); markup = g_markup_printf_escaped (format, base_name); gtk_label_set_markup (GTK_LABEL (dialog->priv->label), markup); @@ -219,12 +219,20 @@ ev_password_dialog_entry_activated_cb (GtkEntry *entry, gtk_dialog_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); } +static void +ev_password_item_created_callback (GnomeKeyringResult result, + guint32 val, + gpointer data) +{ + /* Nothing yet */ + return; +} + void ev_password_dialog_save_password (EvPasswordDialog *dialog) { GnomeKeyringAttributeList *attributes; GnomeKeyringAttribute attribute; - guint32 item_id; gchar *name; gchar *unescaped_uri; @@ -244,23 +252,23 @@ ev_password_dialog_save_password (EvPasswordDialog *dialog) name = g_strdup_printf (_("Password for document %s"), unescaped_uri); if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog->priv->check_default))) { - gnome_keyring_item_create_sync (NULL, - GNOME_KEYRING_ITEM_GENERIC_SECRET, - name, - attributes, - ev_password_dialog_get_password (dialog), - TRUE, - &item_id); + gnome_keyring_item_create (NULL, + GNOME_KEYRING_ITEM_GENERIC_SECRET, + name, + attributes, + ev_password_dialog_get_password (dialog), + TRUE, ev_password_item_created_callback, + NULL, NULL); } if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog->priv->check_session))) { - gnome_keyring_item_create_sync ("session", - GNOME_KEYRING_ITEM_GENERIC_SECRET, - name, - attributes, - ev_password_dialog_get_password (dialog), - TRUE, - &item_id); + gnome_keyring_item_create ("session", + GNOME_KEYRING_ITEM_GENERIC_SECRET, + name, + attributes, + ev_password_dialog_get_password (dialog), + TRUE, ev_password_item_created_callback, + NULL, NULL); } gnome_keyring_attribute_list_free (attributes);