/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2002 Match Grun
+ * Copyright (C) 2002-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,
* 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/>.
+ *
*/
/*
#include "defs.h"
#include <glib.h>
+#include <glib/gi18n.h>
#include <gdk/gdkkeysyms.h>
#include <gtk/gtkmain.h>
#include <gtk/gtkwidget.h>
#include <gtk/gtkfilesel.h>
#include <gtk/gtksignal.h>
-#include "intl.h"
#include "main.h"
#include "inc.h"
#include "mbox.h"
GtkWidget *statusbar;
gint status_cid;
gboolean cancelled;
+ gboolean done;
gchar *folderPath;
GtkWidget *clistCount;
} addrgather_dlg;
};
static GList *_harv_messageList_;
-void addrgather_dlg_status_show( gchar *msg ) {
+static void addrgather_dlg_status_show( gchar *msg ) {
if( addrgather_dlg.statusbar != NULL ) {
gtk_statusbar_pop( GTK_STATUSBAR(addrgather_dlg.statusbar),
addrgather_dlg.status_cid );
return TRUE;
}
-static void addrgather_dlg_key_pressed(
+static gboolean addrgather_dlg_key_pressed(
GtkWidget *widget, GdkEventKey *event, gpointer data )
{
if( event && event->keyval == GDK_Escape ) {
addrgather_dlg.cancelled = TRUE;
gtk_main_quit();
}
+ return FALSE;
}
#define FMT_BUFSIZE 32
addrgather_dlg_status_show(
_( "Please select the mail headers to search." ) );
addrharvest_free( harvester );
+ g_free( name );
return FALSE;
}
/* Go fer it */
- addrgather_dlg_status_show( _( "Busy harvesting addresses..." ) );
+ addrgather_dlg_status_show( _( "Harvesting addresses..." ) );
+ GTK_EVENTS_FLUSH();
sz = gtk_spin_button_get_value_as_int(
GTK_SPIN_BUTTON( addrgather_dlg.spinbtnFolder ) );
addrharvest_set_folder_size( harvester, sz );
addrgather_dlg_status_show( _("Addresses gathered successfully.") );
/* Display summary page */
- gtk_notebook_set_page(
+ gtk_notebook_set_current_page(
GTK_NOTEBOOK(addrgather_dlg.notebook), PAGE_FINISH );
- gtk_widget_set_sensitive( addrgather_dlg.btnOk, FALSE );
- gtk_widget_grab_default( addrgather_dlg.btnCancel );
+ addrgather_dlg.done = TRUE;
+ gtk_widget_set_sensitive( addrgather_dlg.btnCancel, FALSE );
+ gtk_widget_grab_default( addrgather_dlg.btnOk );
return TRUE;
}
static void addrgather_dlg_ok( GtkWidget *widget, gpointer data ) {
+ if(addrgather_dlg.done) {
+ addrgather_dlg.done = FALSE;
+ gtk_main_quit();
+ return;
+ }
if( addrgather_dlg_harvest() ) {
addrgather_dlg.cancelled = FALSE;
}
gtk_main_quit();
}
-#define PACK_CHECK_BUTTON(box, chkbtn, label) \
+#define PACK_CHECK_BUTTON(box, checkbtn, label) \
{ \
- chkbtn = gtk_check_button_new_with_label(label); \
- gtk_widget_show(chkbtn); \
- gtk_box_pack_start(GTK_BOX(box), chkbtn, FALSE, TRUE, 0); \
+ checkbtn = gtk_check_button_new_with_label(label); \
+ gtk_widget_show(checkbtn); \
+ gtk_box_pack_start(GTK_BOX(box), checkbtn, FALSE, TRUE, 0); \
}
/*
/* First row */
top = 0;
- label = gtk_label_new(_(""));
+ label = gtk_label_new("");
gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0);
gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
gtk_adjustment_new( DFL_FOLDER_SIZE, MIN_FOLDER_SIZE, G_MAXINT, 1, 10, 100 );
spinbtnFolder = gtk_spin_button_new( GTK_ADJUSTMENT(adjFolder), 1, 0 );
gtk_box_pack_start( GTK_BOX(hboxs), spinbtnFolder, FALSE, FALSE, 0);
- gtk_widget_set_usize( spinbtnFolder, 100, -1);
+ gtk_widget_set_size_request( spinbtnFolder, 100, -1);
gtk_spin_button_set_numeric( GTK_SPIN_BUTTON(spinbtnFolder), TRUE );
gtk_table_attach( GTK_TABLE(table), hboxs, 1, 2, top, (top + 1), GTK_FILL, 0, 0, 0 );
/* Recurse folders */
top += 4;
- checkRecurse = gtk_check_button_new_with_label( _("Include sub-folders" ) );
+ checkRecurse = gtk_check_button_new_with_label( _("Include subfolders" ) );
gtk_table_attach( GTK_TABLE(table), checkRecurse, 0, 2, top, (top + 1),
GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0 );
gtk_container_add( GTK_CONTAINER(vbox), clistSWin );
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(clistSWin),
GTK_POLICY_AUTOMATIC,
- GTK_POLICY_ALWAYS);
+ GTK_POLICY_AUTOMATIC);
clistCount = gtk_clist_new_with_titles( FIELDS_N_COLS, titles );
gtk_container_add( GTK_CONTAINER(clistSWin), clistCount );
GtkWidget *hbbox;
GtkWidget *hsbox;
- window = gtk_window_new( GTK_WINDOW_DIALOG );
- gtk_widget_set_usize( window, 380, -1 );
+ window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "addrgather" );
+ gtk_widget_set_size_request( window, 380, -1 );
gtk_container_set_border_width(GTK_CONTAINER(window), 0);
gtk_window_set_position( GTK_WINDOW(window), GTK_WIN_POS_CENTER );
gtk_window_set_modal( GTK_WINDOW(window), TRUE );
- gtk_signal_connect( GTK_OBJECT(window), "delete_event",
- GTK_SIGNAL_FUNC( addrgather_dlg_delete_event ), NULL );
- gtk_signal_connect( GTK_OBJECT(window), "key_press_event",
- GTK_SIGNAL_FUNC( addrgather_dlg_key_pressed ), NULL );
+ g_signal_connect(G_OBJECT(window), "delete_event",
+ G_CALLBACK(addrgather_dlg_delete_event), NULL);
+ g_signal_connect(G_OBJECT(window), "key_press_event",
+ G_CALLBACK(addrgather_dlg_key_pressed), NULL);
vbox = gtk_vbox_new( FALSE, 8 );
gtk_container_add( GTK_CONTAINER(window), vbox );
gtk_box_pack_start( GTK_BOX(hsbox), statusbar, TRUE, TRUE, BORDER_WIDTH );
/* Button panel */
- gtkut_button_set_create( &hbbox, &btnOk, _("OK"),
- &btnCancel, _("Cancel"), NULL, NULL );
+ gtkut_stock_button_set_create(&hbbox, &btnOk, GTK_STOCK_OK,
+ &btnCancel, GTK_STOCK_CANCEL,
+ NULL, NULL );
gtk_box_pack_end( GTK_BOX(vbox), hbbox, FALSE, FALSE, 0 );
- gtk_container_set_border_width( GTK_CONTAINER(hbbox), 0 );
+ gtk_container_set_border_width( GTK_CONTAINER(hbbox), 10 );
/* Signal handlers */
- gtk_signal_connect( GTK_OBJECT(btnOk), "clicked",
- GTK_SIGNAL_FUNC(addrgather_dlg_ok), NULL );
- gtk_signal_connect( GTK_OBJECT(btnCancel), "clicked",
- GTK_SIGNAL_FUNC(addrgather_dlg_cancel), NULL );
+ g_signal_connect(G_OBJECT(btnOk), "clicked",
+ G_CALLBACK(addrgather_dlg_ok), NULL);
+ g_signal_connect(G_OBJECT(btnCancel), "clicked",
+ G_CALLBACK(addrgather_dlg_cancel), NULL);
gtk_widget_show_all( vbox );
addrgather_dlg.window = window;
addrgather_dlg.btnCancel = btnCancel;
addrgather_dlg.statusbar = statusbar;
addrgather_dlg.status_cid = gtk_statusbar_get_context_id(
- GTK_STATUSBAR(statusbar), "Harvest E-Mail Address Dialog" );
+ GTK_STATUSBAR(statusbar), "Harvest Email Address Dialog" );
/* Create notebook pages */
addrgather_page_warning( PAGE_WARNING, _( "Warning" ) );
if( ! addrgather_dlg.window ) {
addrgather_dlg_create();
}
+
+ addrgather_dlg.done = FALSE;
errFlag = TRUE;
if( folderItem && folderItem->path ) {
- gtk_notebook_set_page(
+ gtk_notebook_set_current_page(
GTK_NOTEBOOK(addrgather_dlg.notebook), PAGE_FIELDS );
addrgather_dlg.folderPath = folder_item_get_path( folderItem );
gtk_toggle_button_set_active(
GTK_TOGGLE_BUTTON(addrgather_dlg.checkHeader[i]),
FALSE );
- if( g_strcasecmp( _harv_headerNames_[i], HEADER_FROM ) == 0 ) {
+ if( g_utf8_collate( _harv_headerNames_[i], HEADER_FROM ) == 0 ) {
gtk_toggle_button_set_active(
GTK_TOGGLE_BUTTON(addrgather_dlg.checkHeader[i]),
TRUE );
/* Apply window title */
if( sourceInd ) {
gtk_window_set_title( GTK_WINDOW(addrgather_dlg.window),
- _("Harvest E-Mail Addresses - from Selected Messages") );
+ _("Harvest Email Addresses - from Selected Messages") );
gtk_widget_set_sensitive( addrgather_dlg.checkRecurse, FALSE );
if( msgList == NULL ) {
errFlag = TRUE;
}
else {
gtk_window_set_title( GTK_WINDOW(addrgather_dlg.window),
- _("Harvest E-Mail Addresses - from Folder") );
+ _("Harvest Email Addresses - from Folder") );
gtk_widget_set_sensitive( addrgather_dlg.checkRecurse, TRUE );
}
gtk_toggle_button_set_active(
gtk_widget_show( addrgather_dlg.window );
if( errFlag ) {
- gtk_notebook_set_page(
+ gtk_notebook_set_current_page(
GTK_NOTEBOOK(addrgather_dlg.notebook), PAGE_WARNING );
gtk_widget_set_sensitive( addrgather_dlg.btnOk, FALSE );
gtk_widget_grab_default( addrgather_dlg.btnCancel );
projects / claws.git / blobdiff