2007-11-04 [paul] 3.0.2cvs116
[claws.git] / src / addressbook_foldersel.c
index f33ae2dd1beaad5f7ea1d49e6ce4671c14c0f2ea..e365e0adc75c2d9ccf76cb823e6b7fe4eb75d71f 100644 (file)
@@ -1,10 +1,10 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2006 Match Grun and the Sylpheed-Claws team
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * 
  */
 
 /*
@@ -159,7 +159,7 @@ static void addressbook_foldersel_create( void )
        GtkWidget *cancel_btn;
        static GdkGeometry geometry;
 
-       window = gtk_window_new( GTK_WINDOW_TOPLEVEL );
+       window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "addressbook_foldersel" );
        gtk_container_set_border_width( GTK_CONTAINER(window), 0 );
        gtk_window_set_title( GTK_WINDOW(window), _("Select Address Book Folder") );
        gtk_window_set_position( GTK_WINDOW(window), GTK_WIN_POS_MOUSE );
@@ -255,7 +255,7 @@ static void addressbook_foldersel_load_folder( GtkCTreeNode *parentNode, ItemFol
                fName = g_strdup( ADDRITEM_NAME(folder) );
 
                name = &fName;
-               node = gtk_sctree_insert_node( tree, parentNode, NULL, name, FOLDER_SPACING,
+               node = gtk_ctree_insert_node( tree, parentNode, NULL, name, FOLDER_SPACING,
                                folderXpm, folderXpmMask, folderXpm, folderXpmMask,
                                FALSE, TRUE );
 
@@ -323,7 +323,7 @@ static void addressbook_foldersel_load_data( AddressIndex *addrIndex, gchar *pat
                                /* Add node for address book */
                                abf = ds->rawDataSource;
                                name = &dsName;
-                               node = gtk_sctree_insert_node( tree, NULL, NULL,
+                               node = gtk_ctree_insert_node( tree, NULL, NULL,
                                                name, FOLDER_SPACING, bookXpm,
                                                bookXpmMask, bookXpm, bookXpmMask,
                                                FALSE, TRUE );
@@ -369,9 +369,9 @@ static void addressbook_foldersel_load_data( AddressIndex *addrIndex, gchar *pat
 gboolean addressbook_foldersel_selection( AddressIndex *addrIndex,
                                        AddressBookFile **book, ItemFolder **folder, gchar* path)
 {
+       FolderPathMatch folder_path_match = { NULL, FALSE, 0, NULL };
        gboolean retVal = FALSE;
        addressbook_foldersel_cancelled = FALSE;
-       FolderPathMatch folder_path_match = { NULL, FALSE, 0, NULL };
 
        if ( ! addressbook_foldersel_dlg.window )
                addressbook_foldersel_create();