← Back to branch summary

~ubuntu-branches/ubuntu/maverick/gnome-control-center/maverick

« back to all changes in this revision

Viewing changes to capplets/about-me/gnome-about-me-password.c

  • Committer: Bazaar Package Importer
  • Author(s): Didier Roche, Robert Ancell, Didier Roche
  • Date: 2010-09-03 19:12:11 UTC
  • mfrom: (1.1.41 upstream)
  • Revision ID: james.westby@ubuntu.com-20100903191211-mxfkdc9w1ub3wx0s
Tags: 1:2.31.91-0ubuntu1
[ Robert Ancell ]
* New upstream release
* debian/patches/92_git_correct_escaping.patch:
  - Applied upstream

[ Didier Roche ]
* Readd dropped debian/patches/113_at_properties_add_visual_bell.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
capplets/about-me/gnome-about-me-password.c
504
504
                                                          "longer",
505
505
                                                          "palindrome",
506
506
                                                          "dictionary",
507
 
                                                          "simple",
 
507
                                                          "simpl", /* catches both simple and simplistic */
508
508
                                                          "similar",
 
509
                                                          "different",
509
510
                                                          "case",
510
511
                                                          "wrapped",
511
512
                                                          "recovered",
 
513
                                                          "recent"
512
514
                                                          "unchanged",
513
515
                                                          "match",
514
516
                                                          "1 numeric or special",
537
539
                                                   g_strrstr (str->str, "longer") != NULL) {
538
540
                                                msg = g_strdup (_("The password is too short."));
539
541
                                        } else if (g_strrstr (str->str, "palindrome") != NULL ||
540
 
                                                   g_strrstr (str->str, "simple") != NULL ||
 
542
                                                   g_strrstr (str->str, "simpl") != NULL ||
541
543
                                                   g_strrstr (str->str, "dictionary") != NULL) {
542
544
                                                msg = g_strdup (_("The password is too simple."));
543
545
                                        } else if (g_strrstr (str->str, "similar") != NULL ||
 
546
                                                   g_strrstr (str->str, "different") != NULL ||
544
547
                                                   g_strrstr (str->str, "case") != NULL ||
545
548
                                                   g_strrstr (str->str, "wrapped") != NULL) {
546
549
                                                msg = g_strdup (_("The old and new passwords are too similar."));
549
552
                                        } else if (g_strrstr (str->str, "unchanged") != NULL ||
550
553
                                                   g_strrstr (str->str, "match") != NULL) {
551
554
                                                msg = g_strdup (_("The old and new passwords are the same."));
 
555
                                        } else if (g_strrstr (str->str, "recent") != NULL) {
 
556
                                                msg = g_strdup (_("The new password has already been used recently."));
552
557
                                        } else if (g_strrstr (str->str, "failure") != NULL) {
553
558
                                                /* Authentication failure */
554
559
                                                msg = g_strdup (_("Your password has been changed since you initially authenticated! Please re-authenticate."));
678
683
                cursor = gdk_cursor_new_for_display (display, GDK_WATCH);
679
684
        }
680
685
 
681
 
        gdk_window_set_cursor (toplevel->window, cursor);
 
686
        gdk_window_set_cursor (gtk_widget_get_window (toplevel), cursor);
682
687
        gdk_display_flush (display);
683
688
 
684
689
        if (busy) {
770
775
                gtk_widget_grab_focus (GTK_WIDGET (pdialog->new_password));
771
776
 
772
777
                /* Set open lock image */
773
 
                gtk_image_set_from_file (GTK_IMAGE (pdialog->dialog_image), GNOMECC_PIXMAP_DIR "/gnome-about-me-lock-open.png");
 
778
                gtk_image_set_from_icon_name (GTK_IMAGE (pdialog->dialog_image), "changes-allow", GTK_ICON_SIZE_DIALOG);
774
779
        } else {
775
780
                /* Not authenticated state */
776
781
 
778
783
                gtk_widget_grab_focus (GTK_WIDGET (pdialog->current_password));
779
784
 
780
785
                /* Set closed lock image */
781
 
                gtk_image_set_from_file (GTK_IMAGE (pdialog->dialog_image), GNOMECC_PIXMAP_DIR "/gnome-about-me-lock.png");
 
786
                gtk_image_set_from_icon_name (GTK_IMAGE (pdialog->dialog_image), "changes-prevent", GTK_ICON_SIZE_DIALOG);
782
787
        }
783
788
}
784
789