2005-10-16 [colin] 1.9.15cvs61

[claws.git] / src / editldap.c

diff --git a/src/editldap.c b/src/editldap.c
index f745c3519895589597d75194e2ce1770f3affd65..a7dac2dcc6df71a448e250f1b716004a57ad8d26 100644 (file)
--- a/src/editldap.c
+++ b/src/editldap.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 /*
@@ -30,6 +30,7 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtkwindow.h>
 #include <gtk/gtksignal.h>
@@ -38,7 +39,6 @@
 #include <gtk/gtktable.h>
 #include <gtk/gtkbutton.h>
 
-#include "intl.h"
 #include "addressbook.h"
 #include "prefs_common.h"
 #include "addressitem.h"
@@ -137,7 +137,7 @@ static void edit_ldap_status_show( gchar *msg ) {
 static gboolean edit_ldap_validate( void ) {
        gchar *str;
        gboolean errorFlag;
-       gint page;
+       gint page = 0;
 
        errorFlag = FALSE;
        str = gtk_editable_get_chars(
@@ -339,8 +339,9 @@ static void addressbook_edit_ldap_dialog_create( gboolean *cancelled ) {
        gtk_box_pack_start(GTK_BOX(hsbox), statusbar, TRUE, TRUE, BORDER_WIDTH);
 
        /* Button panel */
-       gtkut_button_set_create(&hbbox, &ok_btn, _("OK"),
-                               &cancel_btn, _("Cancel"), NULL, NULL);
+       gtkut_stock_button_set_create(&hbbox, &ok_btn, GTK_STOCK_OK,
+                                     &cancel_btn, GTK_STOCK_CANCEL,
+                                     NULL, NULL);
        gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
        gtk_widget_grab_default(ok_btn);
 
@@ -423,7 +424,7 @@ static void addressbook_edit_ldap_page_basic( gint pageNum, gchar *pageLbl ) {
                "\"ldap.mydomain.com\" may be appropriate for the " \
                "\"mydomain.com\" organization. An IP address may also be " \
                "used. You may specify \"localhost\" if running an LDAP " \
-               "server on the same computer as Sylpheed." ),
+               "server on the same computer as Sylpheed-Claws." ),
                NULL );
 
        /* Next row */
@@ -475,7 +476,7 @@ static void addressbook_edit_ldap_page_basic( gint pageNum, gchar *pageLbl ) {
                ),
                NULL );
 
-       lookdn_btn = gtk_button_new_with_label( _(" ... "));
+       lookdn_btn = gtkut_get_browse_file_btn(_("_Browse"));
        gtk_table_attach(GTK_TABLE(table), lookdn_btn, 2, 3, top, (top + 1), GTK_FILL, 0, 3, 0);
 
        toolTip = gtk_tooltips_new();
@@ -690,6 +691,7 @@ static void addressbook_edit_ldap_page_extended( gint pageNum, gchar *pageLbl )
        entry_bindPW = gtk_entry_new();
        gtk_table_attach(GTK_TABLE(table), entry_bindPW, 1, 2, top, (top + 1),
                GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
+       gtk_entry_set_visibility(GTK_ENTRY(entry_bindPW), FALSE);
 
        toolTip = gtk_tooltips_new();
        gtk_tooltips_set_tip( toolTip, entry_bindPW, _(