2007-10-18 [mones] 3.0.2cvs86

[claws.git] / src / editbook.c

diff --git a/src/editbook.c b/src/editbook.c
index 9b5d9c8bc2f78c92c6916aea7093f2a9f15f68db..5d88da4940a90f487be443ac8b735e5f10555de3 100644 (file)
--- a/src/editbook.c
+++ b/src/editbook.c
@@ -1,10 +1,10 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2002 Match Grun
+ * Copyright (C) 2001-2007 Match Grun and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -13,8 +13,8 @@
  * GNU General Public License for more details.
  *
  * 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * 
  */
 
 /*
@@ -28,6 +28,7 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtkwindow.h>
 #include <gtk/gtksignal.h>
@@ -36,7 +37,6 @@
 #include <gtk/gtktable.h>
 #include <gtk/gtkbutton.h>
 
-#include "intl.h"
 #include "utils.h"
 #include "prefs_common.h"
 #include "mgutils.h"
@@ -65,7 +65,7 @@ static struct _AddrBookEdit_Dlg {
 /*
 * Edit functions.
 */
-void edit_book_status_show( gchar *msg ) {
+static void edit_book_status_show( gchar *msg ) {
        if( addrbookedit_dlg.statusbar != NULL ) {
                gtk_statusbar_pop( GTK_STATUSBAR(addrbookedit_dlg.statusbar), addrbookedit_dlg.status_cid );
                if( msg ) {
@@ -110,7 +110,7 @@ static void edit_book_file_check( void ) {
 
        t = addrbook_test_read_file( abf, abf->fileName );
        if( t == MGU_SUCCESS ) {
-               sMsg = _("File appears to be Ok.");
+               sMsg = _("File appears to be OK.");
        }
        else if( t == MGU_BAD_FORMAT ) {
                sMsg = _("File does not appear to be a valid address book format.");
@@ -147,7 +147,7 @@ static void addressbook_edit_book_create( gboolean *cancelled ) {
        GtkWidget *hsbox;
        gint top;
 
-       window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+       window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "editbook");
        gtk_widget_set_size_request(window, 450, -1);
        gtk_container_set_border_width( GTK_CONTAINER(window), 0 );
        gtk_window_set_title(GTK_WINDOW(window), _("Edit Addressbook"));
@@ -202,8 +202,9 @@ static void addressbook_edit_book_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, &cancel_btn, GTK_STOCK_CANCEL,
+                                     &ok_btn, GTK_STOCK_OK,
+                                     NULL, NULL);
        gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
        gtk_container_set_border_width( GTK_CONTAINER(hbbox), 0 );
        gtk_widget_grab_default(ok_btn);