2004-09-02 Marcus Brinkmann <marcus@g10code.de>
authorMarcus Brinkmann <mb@g10code.com>
Thu, 2 Sep 2004 01:47:14 +0000 (01:47 +0000)
committerMarcus Brinkmann <mb@g10code.com>
Thu, 2 Sep 2004 01:47:14 +0000 (01:47 +0000)
* gtk+-2/padlock-keyhole.xpm: File removed.
* gtk+-2/pinentry-gtk-2.c (create_window): Use stock icon.
* gtk+-2/gtksecentry.h, gtk+-2/gtksecentry.c: Fix copyright notice.

Submitted by Albrecht Dress albrecht.dress@arcor.de.

ChangeLog
gtk+-2/gtksecentry.c
gtk+-2/gtksecentry.h
gtk+-2/padlock-keyhole.xpm [deleted file]
gtk+-2/pinentry-gtk-2.c

index 0d70d31..0c82a00 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-09-02  Marcus Brinkmann  <marcus@g10code.de>
+
+       * gtk+-2/padlock-keyhole.xpm: File removed.
+       * gtk+-2/pinentry-gtk-2.c (create_window): Use stock icon.
+       * gtk+-2/gtksecentry.h, gtk+-2/gtksecentry.c: Fix copyright notice.
+
+       Submitted by Albrecht Dress albrecht.dress@arcor.de.
+
 2004-08-17  Marcus Brinkmann  <marcus@g10code.de>
 
        * configure.ac: Invoke AC_PROG_LN_S.
index 9bf67e9..688eb22 100644 (file)
@@ -1,5 +1,6 @@
 /* GTK - The GIMP Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
+ * Copyright (C) 2004 Albrecht Dreß
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
 
 /*
  * Heavily stripped down for use in pinentry-gtk-2 by Albrecht Dreß
- * <albrecht.dress@arcor.de> Feb. 2004.
- *
- * (C) by Albrecht Dreß 2004 unter the terms of the GNU Lesser General
- * Public License.
+ * <albrecht.dress@arcor.de> Feb. 2004:
  *
  * The entry is now always invisible, uses secure memory methods to
  * allocate the text memory, and all potentially dangerous methods
index de1b220..f621ee2 100644 (file)
@@ -1,5 +1,6 @@
 /* GTK - The GIMP Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
+ * Copyright (C) 2004 Albrecht Dreß
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
 
 /*
  * Heavily stripped down for use in pinentry-gtk-2 by Albrecht Dreß
- * <albrecht.dress@arcor.de> Feb. 2004.
- *
- * (C) by Albrecht Dreß 2004 unter the terms of the GNU Lesser General
- * Public License.
+ * <albrecht.dress@arcor.de> Feb. 2004:
  *
  * The entry is now always invisible, uses secure memory methods to
  * allocate the text memory, and all potentially dangerous methods
diff --git a/gtk+-2/padlock-keyhole.xpm b/gtk+-2/padlock-keyhole.xpm
deleted file mode 100644 (file)
index 0ba4c46..0000000
+++ /dev/null
@@ -1,403 +0,0 @@
-/* XPM */
-static const char * padlock_keyhole_xpm[] = {
-"48 48 352 2",
-"      c None",
-".     c #000000",
-"+     c #010101",
-"@     c #9B9B9B",
-"#     c #D0D0D0",
-"$     c #E3E3E3",
-"%     c #E9E9E9",
-"&     c #DDDDDD",
-"*     c #C6C6C6",
-"=     c #919191",
-"-     c #BEBEBE",
-";     c #EAEAEA",
-">     c #F1F1F1",
-",     c #F3F3F3",
-"'     c #EDEDED",
-")     c #E6E6E6",
-"!     c #E2E2E2",
-"~     c #D8D8D8",
-"{     c #9C9C9C",
-"]     c #606060",
-"^     c #F0F0F0",
-"/     c #ECECEC",
-"(     c #E4E4E4",
-"_     c #E1E1E1",
-":     c #D6D6D6",
-"<     c #B7B7B7",
-"[     c #454545",
-"}     c #858585",
-"|     c #D9D9D9",
-"1     c #CECECE",
-"2     c #C2C2C2",
-"3     c #CCCCCC",
-"4     c #D5D5D5",
-"5     c #DCDCDC",
-"6     c #E0E0E0",
-"7     c #C8C8C8",
-"8     c #B9B9B9",
-"9     c #626262",
-"0     c #5E5E5E",
-"a     c #E8E8E8",
-"b     c #BCBCBC",
-"c     c #585858",
-"d     c #141414",
-"e     c #7B7B7B",
-"f     c #DFDFDF",
-"g     c #C3C3C3",
-"h     c #BBBBBB",
-"i     c #4C4C4C",
-"j     c #979797",
-"k     c #B6B6B6",
-"l     c #EBEBEB",
-"m     c #8A8A8A",
-"n     c #929292",
-"o     c #DBDBDB",
-"p     c #B3B3B3",
-"q     c #939393",
-"r     c #C0C0C0",
-"s     c #020202",
-"t     c #A2A2A2",
-"u     c #E5E5E5",
-"v     c #A0A0A0",
-"w     c #818181",
-"x     c #D1D1D1",
-"y     c #AEAEAE",
-"z     c #767676",
-"A     c #F2F2F2",
-"B     c #2F2F2F",
-"C     c #828282",
-"D     c #EEEEEE",
-"E     c #B5B5B5",
-"F     c #9F9F9F",
-"G     c #0F0F0F",
-"H     c #1F1F1F",
-"I     c #A8A8A8",
-"J     c #EFEFEF",
-"K     c #CBCBCB",
-"L     c #C5C5C5",
-"M     c #DADADA",
-"N     c #CACACA",
-"O     c #ABABAB",
-"P     c #ADACAA",
-"Q     c #371908",
-"R     c #9C5217",
-"S     c #B86E25",
-"T     c #B96B26",
-"U     c #A75A1C",
-"V     c #A55E1F",
-"W     c #BC732A",
-"X     c #B86F27",
-"Y     c #97551A",
-"Z     c #C99C62",
-"`     c #F4E1CB",
-" .    c #F4E0C9",
-"..    c #EFDBBE",
-"+.    c #ECD5B7",
-"@.    c #EBD2B4",
-"#.    c #EAD2B3",
-"$.    c #EBCFB0",
-"%.    c #E9CEAE",
-"&.    c #E8CCAB",
-"*.    c #E7CCA8",
-"=.    c #E8C7A1",
-"-.    c #E6C6A1",
-";.    c #E5C5A0",
-">.    c #E3C29A",
-",.    c #E0C09B",
-"'.    c #E0BD93",
-").    c #DFBA92",
-"!.    c #DFBA8E",
-"~.    c #DDB386",
-"{.    c #D5AC7C",
-"].    c #A2611B",
-"^.    c #F5E6D0",
-"/.    c #EAD3AF",
-"(.    c #EACFAF",
-"_.    c #DAB88B",
-":.    c #DAB687",
-"<.    c #D8B081",
-"[.    c #D6AE7F",
-"}.    c #D3AB7C",
-"|.    c #D1A974",
-"1.    c #CFA56E",
-"2.    c #CCA36D",
-"3.    c #CA9F67",
-"4.    c #C89E67",
-"5.    c #C69B63",
-"6.    c #C29861",
-"7.    c #C2935B",
-"8.    c #BF9052",
-"9.    c #BC884B",
-"0.    c #BD8440",
-"a.    c #BA7E3D",
-"b.    c #B37634",
-"c.    c #A76A22",
-"d.    c #8D5314",
-"e.    c #F5E4CE",
-"f.    c #E7CDA8",
-"g.    c #DFBD90",
-"h.    c #D8B183",
-"i.    c #D5AD7E",
-"j.    c #D2AA7B",
-"k.    c #D2A677",
-"l.    c #D0A771",
-"m.    c #CDA36C",
-"n.    c #C89F68",
-"o.    c #C59B64",
-"p.    c #C49961",
-"q.    c #C59A62",
-"r.    c #C2985D",
-"s.    c #C1945A",
-"t.    c #BF9054",
-"u.    c #BE8E4F",
-"v.    c #BC8749",
-"w.    c #BA823F",
-"x.    c #B17432",
-"y.    c #8B5214",
-"z.    c #E0BF97",
-"A.    c #DBB486",
-"B.    c #D7AF80",
-"C.    c #D2AC7B",
-"D.    c #D0A66F",
-"E.    c #B58E5C",
-"F.    c #A07E50",
-"G.    c #9A794D",
-"H.    c #B28C59",
-"I.    c #C79C64",
-"J.    c #C2975F",
-"K.    c #BC8441",
-"L.    c #B57C38",
-"M.    c #AF732C",
-"N.    c #A3661E",
-"O.    c #875014",
-"P.    c #E8CDA9",
-"Q.    c #DFBC92",
-"R.    c #D2AB7D",
-"S.    c #D0AB75",
-"T.    c #B38E5D",
-"U.    c #94744A",
-"V.    c #775E3C",
-"W.    c #201910",
-"X.    c #79603E",
-"Y.    c #C79D66",
-"Z.    c #BF9156",
-"`.    c #BE8645",
-" +    c #BC833F",
-".+    c #B67C37",
-"++    c #AA6C23",
-"@+    c #8D5514",
-"#+    c #E8CEA9",
-"$+    c #E1BC94",
-"%+    c #DAB487",
-"&+    c #D8B281",
-"*+    c #D0A873",
-"=+    c #92744D",
-"-+    c #7A603E",
-";+    c #79603F",
-">+    c #BE8F51",
-",+    c #BA813D",
-"'+    c #B77E3A",
-")+    c #B37934",
-"!+    c #A66921",
-"~+    c #E5C9A4",
-"{+    c #DDBA90",
-"]+    c #D2A575",
-"^+    c #D1A770",
-"/+    c #95754C",
-"(+    c #201A10",
-"_+    c #211A10",
-":+    c #D7B78E",
-"<+    c #BD8C4C",
-"[+    c #BC8845",
-"}+    c #BB823E",
-"|+    c #A96B22",
-"1+    c #E9CDAC",
-"2+    c #E7CBA6",
-"3+    c #D1A572",
-"4+    c #96774E",
-"5+    c #E1CBAD",
-"6+    c #C09359",
-"7+    c #BC8543",
-"8+    c #B37832",
-"9+    c #E8CCA7",
-"0+    c #E5CAA4",
-"a+    c #DCB98F",
-"b+    c #CAA16B",
-"c+    c #20190F",
-"d+    c #DEC6A7",
-"e+    c #C19256",
-"f+    c #BD8D4E",
-"g+    c #B57D3A",
-"h+    c #B57836",
-"i+    c #AD722C",
-"j+    c #A4661D",
-"k+    c #D2AB79",
-"l+    c #D1A872",
-"m+    c #755C38",
-"n+    c #755B37",
-"o+    c #DDC7A7",
-"p+    c #B77F3C",
-"q+    c #B0752F",
-"r+    c #A46821",
-"s+    c #895114",
-"t+    c #E9CEAA",
-"u+    c #DAB385",
-"v+    c #201A11",
-"w+    c #927E63",
-"x+    c #E3CFB3",
-"y+    c #D4B388",
-"z+    c #BB8444",
-"A+    c #B67A39",
-"B+    c #B17630",
-"C+    c #D2AC77",
-"D+    c #CDA46E",
-"E+    c #A57D4D",
-"F+    c #D9BF9E",
-"G+    c #CAA371",
-"H+    c #B77D38",
-"I+    c #AD6F26",
-"J+    c #BA935E",
-"K+    c #95744A",
-"L+    c #C5B39B",
-"M+    c #B57938",
-"N+    c #AD762E",
-"O+    c #AF722A",
-"P+    c #E1BD96",
-"Q+    c #CAA069",
-"R+    c #B58F5D",
-"S+    c #836641",
-"T+    c #8F7554",
-"U+    c #BC8947",
-"V+    c #BD8242",
-"W+    c #DBB88E",
-"X+    c #D1A776",
-"Y+    c #CCA26B",
-"Z+    c #B48D59",
-"`+    c #6C5433",
-" @    c #6D5536",
-".@    c #B47B37",
-"+@    c #C08D51",
-"@@    c #894E14",
-"#@    c #DCB387",
-"$@    c #D1AB76",
-"%@    c #B28B57",
-"&@    c #AC834E",
-"*@    c #3F301C",
-"=@    c #40321E",
-"-@    c #D2BD9F",
-";@    c #C8A271",
-">@    c #B8803D",
-",@    c #AF742E",
-"'@    c #864C13",
-")@    c #E6CAA5",
-"!@    c #B28753",
-"~@    c #9A7545",
-"{@    c #89683E",
-"]@    c #DAC1A0",
-"^@    c #BD8E50",
-"/@    c #B17732",
-"(@    c #AD712A",
-"_@    c #CA9D63",
-":@    c #874D14",
-"<@    c #E4C8A3",
-"[@    c #DAB88D",
-"}@    c #CBA26C",
-"|@    c #B78F5B",
-"1@    c #7F633F",
-"2@    c #725938",
-"3@    c #D3B389",
-"4@    c #CC9F69",
-"5@    c #B87F3B",
-"6@    c #BC823D",
-"7@    c #CEA16B",
-"8@    c #E8CBA5",
-"9@    c #C1975C",
-"0@    c #C09257",
-"a@    c #B9813E",
-"b@    c #BC8545",
-"c@    c #CDA06A",
-"d@    c #E6C9A3",
-"e@    c #D9B888",
-"f@    c #D3A676",
-"g@    c #BC8C4D",
-"h@    c #BE8A4D",
-"i@    c #BE8B4F",
-"j@    c #C79D60",
-"k@    c #E6C8A1",
-"l@    c #E1C39C",
-"m@    c #C2995F",
-"n@    c #D2AA77",
-"o@    c #D4A773",
-"p@    c #BF8A4C",
-"q@    c #B17330",
-"r@    c #331707",
-"s@    c #B2752D",
-"t@    c #C49A5D",
-"u@    c #B87E39",
-"v@    c #B37532",
-"w@    c #AF772E",
-"x@    c #AC742B",
-"y@    c #AA7229",
-"z@    c #AE7129",
-"A@    c #A96D26",
-"B@    c #A56922",
-"C@    c #A36720",
-"D@    c #A2651D",
-"E@    c #9E6119",
-"F@    c #9B5F18",
-"G@    c #995D16",
-"H@    c #925615",
-"I@    c #58300D",
-"J@    c #261105",
-"K@    c #311607",
-"                                                                                                ",
-"                                                                                                ",
-"                                                                                                ",
-"                                                                                                ",
-"                                          . . . + . . .                                         ",
-"                                    . . + @ # $ % & * = + . .                                   ",
-"                                  . + - ; > , > ' ; ) ! ~ { + .                                 ",
-"                                . ] $ , ^ / ) ( $ ! ! ! _ : < [ .                               ",
-"                              . } / , ; $ | 1 2 2 3 4 5 6 & 7 8 9 .                             ",
-"                            . 0 / , a 5 b c d . . . e - 6 f 5 g h i .                           ",
-"                          . + ! , % ~ j . .           . { & 6 ~ h k +                           ",
-"                          . 8 , l ~ m .                 . n o f 1 p q .                         ",
-"                          + ; > & r s .                   . t u & r k +                         ",
-"                          v > a * w .                       s 5 ; x y z .                       ",
-"                        . # A | r B .                         C D 5 E F .                       ",
-"                        . _ > 3 r G                           H / ! r I .                       ",
-"                        . ) J K < .                           . % u L y .                       ",
-"                        . M l N O .                           . ( $ N P .                       ",
-"                    Q Q Q R S T U Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q V W X Y Q Q Q Q                 ",
-"                  Q Z `  ...+.@.#.$.%.&.*.=.-.-.-.-.-.=.=.-.;.;.>.,.'.).!.~.{.].Q               ",
-"                  Q ^./.(.>._.:.<.[.}.|.1.2.3.3.3.3.3.3.3.4.5.6.7.8.9.0.a.b.c.d.Q               ",
-"                  Q e.%.f.g.h.i.j.k.l.m.n.o.p.p.p.q.q.q.q.p.r.s.t.u.v.w.a.x.c.y.Q               ",
-"                  Q ^.$.%.z.A.<.B.C.k.D.2.E.F.G.G.H.I.I.I.q.J.7.t.u.K.w.L.M.N.O.Q               ",
-"                  Q e.(.P.Q.i.R.j.S.D.m.T.U.V.W.. W.X.n.3.Y.o.p.r.Z.u.`. +.+++@+Q               ",
-"                  Q e.%.#+$+%+&+B.j.*+1.=+-+. . . . . ;+3.o.q.J.s.>+v.,+'+)+!+y.Q               ",
-"                  Q ` P.~+{+i.j.j.]+^+2./+(+. . . . . _+:+4.5.p.J.Z.<+[+}+.+|+d.Q               ",
-"                  Q e.1+2+Q.<.[.R.j.3+m.4+. . . . . . . 5+Y.p.J.6+>+<+7+a.8+c.y.Q               ",
-"                  Q ` 9+0+a+[.}.j.]+1.b+/+W.. . . . . c+d+6.e+t.f+v.w.g+h+i+j+O.Q               ",
-"                  Q e.1+2+{+i.k+l+1.b+n.q.m+. . . . . n+o+7.e+8.u.9. +p+.+q+r+s+Q               ",
-"                  Q ^.(.t+$+A.u+u+[.k+*+1.2.-+_+. v+w+x+y+5.r.s.t.<+z+p+A+B+r+y.Q               ",
-"                  Q ` t+~+_.C+]+l+D+b+4.p.r.E+. . . F+G+p.6.7.Z.t.<+[+w.H+8+I+s+Q               ",
-"                  Q e.t+2+a+[.}.j.]+D.b+4.J+K+. . . L+p.p.6.e+Z.u.v. +'+M+N+O+O.Q               ",
-"                  Q ^.(.t+P+A.<.[.C.*+m.Q+R+S+. . . T+d+p.r.e+t.f+U+ +'+M+M.V+O.Q               ",
-"                  Q ` *.-.W+}.k+X+D.Y+3.q.Z+`+. . .  @d+p.6.7.e+8.9.z+a..@B++@@@Q               ",
-"                  Q  .2+-.#@$@3+D.m.n.p.%@&@*@. . . =@-@;@7.Z.t.f+U+>@L.h+,@+@'@Q               ",
-"                  Q ` )@-.A.$@l.1.b+4.p.!@~@*@. . . *@{@]@^@f+9.z+w.'+.@/@(@_@:@Q               ",
-"                  Q ` 9+<@[@}.k.S.D.}@n.|@1@. . . . . 2@3@6.e+Z.>+9.K.g+L.B+4@s+Q               ",
-"                  Q e.P.~+a+i.j.k+^+1.b+n.q.q.q.q.q.q.q.q.p.7.Z.8.v. +'+5@6@7@@@Q               ",
-"                  Q ` 8@~+_.j.]+^+D+3.I.p.9@6+0@0@0@0@0@0@Z.8.u.U+z+a@L.5@b@c@O.Q               ",
-"                  Q  .d@;.e@f@l.1.}@3.5.q.p.r.6.6.p.p.q.q.p.s.6+t.g@U+h@p.i@j@@@Q               ",
-"                  Q  .k@l@u+3+1.m.n.o.m@7.0@Z.Z.0@7.9@q.4.m.m.7@7@k+n@3+o@p@q@:@Q               ",
-"                  r@s@j@t@<+a.u@A+h+v@w@i+x@y@y@y@z@z@z@z@y@A@++B@C@D@E@F@G@H@I@J@              ",
-"                    K@Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q J@                ",
-"                                                                                                ",
-"                                                                                                ",
-"                                                                                                ",
-"                                                                                                ",
-"                                                                                                "};
index 6310e1c..219d405 100644 (file)
@@ -45,8 +45,6 @@
 #endif
 
 \f
-#include "padlock-keyhole.xpm"
-
 #define PGMNAME "pinentry-gtk2"
 
 #ifndef VERSION
@@ -190,7 +188,6 @@ create_window (int confirm_mode)
   GtkWidget *win, *box, *ebox;
   GtkWidget *wvbox, *chbox, *bbox;
   GtkAccelGroup *acc;
-  GdkPixbuf *padlock_keyhole;
   gchar *msg;
 
   /* FIXME: check the grabbing code against the one we used with the
@@ -225,8 +222,8 @@ create_window (int confirm_mode)
   chbox = gtk_hbox_new (FALSE, HIG_LARGE);
   gtk_box_pack_start (GTK_BOX (wvbox), chbox, FALSE, FALSE, 0);
 
-  padlock_keyhole = gdk_pixbuf_new_from_xpm_data (padlock_keyhole_xpm);
-  w = gtk_image_new_from_pixbuf (padlock_keyhole);
+  w = gtk_image_new_from_stock (GTK_STOCK_DIALOG_AUTHENTICATION,
+                                              GTK_ICON_SIZE_DIALOG);
   gtk_misc_set_alignment (GTK_MISC (w), 0.0, 0.0);
   gtk_box_pack_start (GTK_BOX (chbox), w, FALSE, FALSE, 0);