[Commits] account.c 1.61.2.98 1.61.2.99 action.c 1.12.2.66 1.12.2.67 addr_compl.c 1.27.2.53 1.27.2.54 addressbook.c 1.60.2.143 1.60.2.144 alertpanel.c 1.17.2.43 1.17.2.44 compose.c 1.382.2.580 1.382.2.581 edittags.c 1.1.2.24 1.1.2.25 folderview.c 1.207.2.220 1.207.2.221 grouplistdialog.c 1.14.2.28 1.14.2.29 image_viewer.c 1.1.2.30 1.1.2.31 mainwindow.c 1.274.2.328 1.274.2.329 mimeview.c 1.83.2.170 1.83.2.171 noticeview.c 1.5.2.25 1.5.2.26 prefs_filtering_action.c 1.1.4.69 1.1.4.70 prefs_folder_column.c 1.1.2.18 1.1.2.19 prefs_msg_colors.c 1.1.2.42 1.1.2.43 prefs_summary_column.c 1.10.2.27 1.10.2.28 prefs_toolbar.c 1.30.2.67 1.30.2.68 printing.c 1.1.2.31 1.1.2.32 stock_pixmap.c 1.25.2.68 1.25.2.69 summaryview.c 1.395.2.430 1.395.2.431 textview.c 1.96.2.232 1.96.2.233 undo.c 1.13.2.22 1.13.2.23 wizard.c 1.1.2.84 1.1.2.85

colin at claws-mail.org colin at claws-mail.org
Fri Oct 7 11:08:59 CEST 2011


Update of /home/claws-mail/claws/src
In directory claws-mail:/tmp/cvs-serv23693/src

Modified Files:
      Tag: gtk2
	account.c action.c addr_compl.c addressbook.c alertpanel.c 
	compose.c edittags.c folderview.c grouplistdialog.c 
	image_viewer.c mainwindow.c mimeview.c noticeview.c 
	prefs_filtering_action.c prefs_folder_column.c 
	prefs_msg_colors.c prefs_summary_column.c prefs_toolbar.c 
	printing.c stock_pixmap.c summaryview.c textview.c undo.c 
	wizard.c 
Log Message:
2011-10-07 [colin]	3.7.10cvs19

	* AUTHORS
	* src/account.c
	* src/action.c
	* src/addr_compl.c
	* src/addressbook.c
	* src/alertpanel.c
	* src/compose.c
	* src/edittags.c
	* src/folderview.c
	* src/grouplistdialog.c
	* src/image_viewer.c
	* src/mainwindow.c
	* src/mimeview.c
	* src/noticeview.c
	* src/prefs_filtering_action.c
	* src/prefs_folder_column.c
	* src/prefs_msg_colors.c
	* src/prefs_summary_column.c
	* src/prefs_toolbar.c
	* src/printing.c
	* src/stock_pixmap.c
	* src/summaryview.c
	* src/textview.c
	* src/undo.c
	* src/wizard.c
	* src/gtk/about.c
	* src/gtk/authors.h
	* src/gtk/colorlabel.c
	* src/gtk/colorsel.c
	* src/gtk/gtkcmclist.c
	* src/gtk/gtkcmctree.c
	* src/gtk/gtkcmoptionmenu.c
	* src/gtk/gtksctree.c
	* src/gtk/gtkutils.c
	* src/gtk/gtkvscrollbutton.c
	* src/gtk/inputdialog.c
	* src/gtk/logwindow.c
	* src/gtk/menu.c
	* src/gtk/prefswindow.c
	* src/gtk/progressdialog.c
	* src/plugins/pgpcore/passphrase.c
	* src/plugins/trayicon/trayicon.c
		Bug #2371, "Port to GTK+ 3.0": Use accessor functions.
		Patch by Hanno Thurow-Meyer, many thanks to him !

Index: edittags.c
===================================================================
RCS file: /home/claws-mail/claws/src/Attic/edittags.c,v
retrieving revision 1.1.2.24
retrieving revision 1.1.2.25
diff -u -d -r1.1.2.24 -r1.1.2.25
--- edittags.c	6 Jul 2011 08:09:57 -0000	1.1.2.24
+++ edittags.c	7 Oct 2011 09:08:56 -0000	1.1.2.25
@@ -90,12 +90,12 @@
 } applywindow;
 
 #define APPLYWINDOW_LOCK() {								\
-	gdk_window_set_cursor(applywindow.window->window, applywindow.watch_cursor);	\
+	gdk_window_set_cursor(gtk_widget_get_window(applywindow.window), applywindow.watch_cursor);	\
 	applywindow.busy = TRUE;							\
 }
 
 #define APPLYWINDOW_UNLOCK() {								\
-	gdk_window_set_cursor(applywindow.window->window, NULL);			\
+	gdk_window_set_cursor(gtk_widget_get_window(applywindow.window), NULL);			\
 	applywindow.busy = FALSE;							\
 }
 

Index: summaryview.c
===================================================================
RCS file: /home/claws-mail/claws/src/summaryview.c,v
retrieving revision 1.395.2.430
retrieving revision 1.395.2.431
diff -u -d -r1.395.2.430 -r1.395.2.431
--- summaryview.c	28 Aug 2011 16:14:39 -0000	1.395.2.430
+++ summaryview.c	7 Oct 2011 09:08:56 -0000	1.395.2.431
@@ -791,8 +791,10 @@
 	g_object_ref(summaryview->hbox_l);
 	g_object_ref(summaryview->statlabel_msgs);
 	
-	gtkut_container_remove(GTK_CONTAINER(summaryview->hbox_l->parent), summaryview->hbox_l);
-	gtkut_container_remove(GTK_CONTAINER(summaryview->statlabel_msgs->parent), summaryview->statlabel_msgs);
+	gtkut_container_remove(GTK_CONTAINER(
+		gtk_widget_get_parent(summaryview->hbox_l)), summaryview->hbox_l);
+	gtkut_container_remove(GTK_CONTAINER(
+		gtk_widget_get_parent(summaryview->statlabel_msgs)), summaryview->statlabel_msgs);
 
 	switch (prefs_common.layout_mode) {
 	case NORMAL_LAYOUT:
@@ -876,7 +878,7 @@
 	if (prefs_common.derive_from_normal_font || !SMALL_FONT) {
 		font_desc = pango_font_description_new();
 		size = pango_font_description_get_size
-			(summaryview->ctree->style->font_desc);
+			(gtk_widget_get_style(summaryview->ctree)->font_desc);
 		pango_font_description_set_size(font_desc, size * PANGO_SCALE_SMALL);
 	} else {
 		font_desc = pango_font_description_from_string(SMALL_FONT);
@@ -2726,7 +2728,7 @@
 void summary_reflect_tags_changes(SummaryView *summaryview)
 {
 	GtkMenuShell *menu;
-	GList *cur;
+	GList *children, *cur;
 	GtkCMCTreeNode *node;
 	GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
 	gboolean froze = FALSE;
@@ -2737,9 +2739,11 @@
 	cm_return_if_fail(menu != NULL);
 
 	/* clear items. get item pointers. */
-	for (cur = menu->children; cur != NULL && cur->data != NULL; cur = cur->next) {
+	children = gtk_container_get_children(GTK_CONTAINER(menu));
+	for (cur = children; cur != NULL && cur->data != NULL; cur = cur->next) {
 		gtk_menu_item_set_submenu(GTK_MENU_ITEM(cur->data), NULL);
 	}
+	g_list_free(children);
 	summary_tags_menu_create(summaryview, TRUE);
 
 	START_LONG_OPERATION(summaryview, TRUE);
@@ -5777,7 +5781,7 @@
 	GtkMenuShell *menu;
 	GtkCheckMenuItem **items;
 	gint n;
-	GList *cur, *sel;
+	GList *children, *cur, *sel;
 
 	summaryview = (SummaryView *)data;
 	cm_return_if_fail(summaryview != NULL);
@@ -5797,7 +5801,8 @@
 			  GINT_TO_POINTER(1));
 
 	/* clear items. get item pointers. */
-	for (n = 0, cur = menu->children; cur != NULL && cur->data != NULL; cur = cur->next) {
+	children = gtk_container_get_children(GTK_CONTAINER(menu));
+	for (n = 0, cur = children; cur != NULL && cur->data != NULL; cur = cur->next) {
 		if (GTK_IS_CHECK_MENU_ITEM(cur->data)) {
 			gtk_check_menu_item_set_active
 				(GTK_CHECK_MENU_ITEM(cur->data), FALSE);
@@ -5806,6 +5811,8 @@
 		}
 	}
 
+	g_list_free(children);
+
 	if (n == (N_COLOR_LABELS + 1)) {
 		/* iterate all messages and set the state of the appropriate
 		 * items */
@@ -5818,7 +5825,7 @@
 				 GTK_CMCTREE_NODE(sel->data));
 			if (msginfo) {
 				clabel = MSG_GET_COLORLABEL_VALUE(msginfo->flags);
-				if (!items[clabel]->active)
+				if (!gtk_check_menu_item_get_active(items[clabel]))
 					gtk_check_menu_item_set_active
 						(items[clabel], TRUE);
 			}
@@ -5901,7 +5908,7 @@
 							  gpointer data)
 {
 	GtkMenuShell *menu;
-	GList *cur;
+	GList *children, *cur;
 	GList *sel;
 	GHashTable *menu_table = g_hash_table_new_full(
 					g_direct_hash,
@@ -5927,7 +5934,8 @@
 			  GINT_TO_POINTER(1));
 
 	/* clear items. get item pointers. */
-	for (cur = menu->children; cur != NULL && cur->data != NULL; cur = cur->next) {
+	children = gtk_container_get_children(GTK_CONTAINER(menu));
+	for (cur = children; cur != NULL && cur->data != NULL; cur = cur->next) {
 		if (GTK_IS_CHECK_MENU_ITEM(cur->data)) {
 			gint id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(cur->data),
 				"tag_id"));
@@ -5939,6 +5947,8 @@
 		}
 	}
 
+	g_list_free(children);
+
 	/* iterate all messages and set the state of the appropriate
 	 * items */
 	sel_len = 0;
@@ -5960,7 +5970,7 @@
 				gint num_checked = GPOINTER_TO_INT(g_hash_table_lookup(menu_allsel_table, tags->data));
 				id = GPOINTER_TO_INT(tags->data);
 				item = g_hash_table_lookup(menu_table, GINT_TO_POINTER(tags->data));
-				if (item && !item->active) {
+				if (item && !gtk_check_menu_item_get_active(item)) {
 					gtk_check_menu_item_set_active
 						(item, TRUE);
 				}
@@ -5970,7 +5980,8 @@
 		}
 	}
 
-	for (cur = menu->children; cur != NULL && cur->data != NULL; cur = cur->next) {
+	children = gtk_container_get_children(GTK_CONTAINER(menu));
+	for (cur = children; cur != NULL && cur->data != NULL; cur = cur->next) {
 		if (GTK_IS_CHECK_MENU_ITEM(cur->data)) {
 			gint id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(cur->data),
 				"tag_id"));
@@ -5981,6 +5992,7 @@
 				gtk_check_menu_item_set_inconsistent(GTK_CHECK_MENU_ITEM(cur->data), FALSE);
 		}
 	}
+	g_list_free(children);
 	g_hash_table_destroy(menu_table);
 	g_hash_table_destroy(menu_allsel_table);
 	/* reset "dont_toggle" state */
@@ -6622,7 +6634,7 @@
 	case GDK_Left:		/* Move focus */
 		adj = gtk_scrolled_window_get_hadjustment
 			(GTK_SCROLLED_WINDOW(summaryview->scrolledwin));
-		if (adj->lower != adj->value)
+		if (gtk_adjustment_get_lower(adj) != gtk_adjustment_get_value(adj))
 			break;
 		/* FALLTHROUGH */	
 	case GDK_Escape:
@@ -7024,7 +7036,7 @@
 				 GDK_ACTION_MOVE|GDK_ACTION_COPY|GDK_ACTION_DEFAULT, button, event);
 	gtk_drag_set_icon_default(context);
 	if (prefs_common.layout_mode == SMALL_LAYOUT) {
-		GtkWidget *paned = GTK_WIDGET_PTR(summaryview)->parent;
+		GtkWidget *paned = gtk_widget_get_parent(GTK_WIDGET_PTR(summaryview));
 		if (paned && GTK_IS_PANED(paned)) {
 	        	mainwindow_reset_paned(GTK_PANED(paned));
 		}
@@ -7101,14 +7113,14 @@
 
 		if (mail_list != NULL) {
 			gtk_selection_data_set(selection_data,
-					       selection_data->target, 8,
+					       gtk_selection_data_get_target(selection_data), 8,
 					       mail_list, strlen(mail_list));
 			g_free(mail_list);
 		} 
 	} else if (info == TARGET_DUMMY) {
 		if (GTK_CMCLIST(summaryview->ctree)->selection)
 			gtk_selection_data_set(selection_data,
-					       selection_data->target, 8,
+					       gtk_selection_data_get_target(selection_data), 8,
 					       "Dummy-Summaryview", 
 					       strlen("Dummy-Summaryview")+1);
 	} else if (info == TARGET_MAIL_CM_PATH_LIST) {
@@ -7140,7 +7152,7 @@
 
 		if (path_list != NULL) {
 			gtk_selection_data_set(selection_data,
-					       selection_data->target, 8,
+					       gtk_selection_data_get_target(selection_data), 8,
 					       path_list, strlen(path_list));
 			g_free(path_list);
 		}
@@ -7190,7 +7202,8 @@
 			gtk_drag_finish(drag_context, FALSE, FALSE, time);			
 			return;
 		} else {
-			folderview_finish_dnd(data->data, drag_context, time, item);
+			folderview_finish_dnd(gtk_selection_data_get_data(data),
+				drag_context, time, item);
 		}
 	}
 }
@@ -7723,20 +7736,22 @@
 void summary_reflect_prefs_custom_colors(SummaryView *summaryview)
 {
 	GtkMenuShell *menu;
-	GList *cur;
+	GList *children, *cur;
 
 	/* re-create colorlabel submenu */
 	menu = GTK_MENU_SHELL(summaryview->colorlabel_menu);
 	cm_return_if_fail(menu != NULL);
 
 	/* clear items. get item pointers. */
-	for (cur = menu->children; cur != NULL && cur->data != NULL; cur = cur->next) {
+	children = gtk_container_get_children(GTK_CONTAINER(menu));
+	for (cur = children; cur != NULL && cur->data != NULL; cur = cur->next) {
 		g_signal_handlers_disconnect_matched
 			 (gtk_ui_manager_get_accel_group(summaryview->mainwin->ui_manager), 
 			 G_SIGNAL_MATCH_DATA|G_SIGNAL_MATCH_FUNC,
 			 0, 0, NULL, mainwin_accel_changed_cb, cur->data);
 		gtk_menu_item_set_submenu(GTK_MENU_ITEM(cur->data), NULL);
 	}
+	g_list_free(children);
 	summary_colorlabel_menu_create(summaryview, TRUE);
 }
 

Index: addr_compl.c
===================================================================
RCS file: /home/claws-mail/claws/src/addr_compl.c,v
retrieving revision 1.27.2.53
retrieving revision 1.27.2.54
diff -u -d -r1.27.2.53 -r1.27.2.54
--- addr_compl.c	10 Apr 2011 17:19:03 -0000	1.27.2.53
+++ addr_compl.c	7 Oct 2011 09:08:55 -0000	1.27.2.54
@@ -23,11 +23,6 @@
 #endif
 #include "defs.h"
 
-/* We know this file uses some deprecated stuff. */
-#undef G_DISABLE_DEPRECATED
-#undef GTK_DISABLE_DEPRECATED
-#undef GDK_DISABLE_DEPRECATED
-
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
@@ -848,9 +843,9 @@
 	gint x, y, width, height, depth;
 
 	/* Get current geometry of window */
-	gdk_window_get_geometry( cw->window->window, &x, &y, &width, &height, &depth );
+	gdk_window_get_geometry( gtk_widget_get_window( cw->window ), &x, &y, &width, &height, &depth );
 
-	gtk_widget_hide_all( cw->window );
+	gtk_widget_hide( cw->window );
 	gtk_widget_show_all( cw->window );
 	gtk_widget_size_request( cw->list_view, &r );
 
@@ -1107,7 +1102,7 @@
 	g_free(text);
 
 	/* Move focus to next widget */
-	parent = GTK_WIDGET(entry)->parent;
+	parent = gtk_widget_get_parent(GTK_WIDGET(entry));
 	if( parent && move_focus) {
 		gtk_widget_child_focus( parent, GTK_DIR_TAB_FORWARD );
 	}
@@ -1317,6 +1312,7 @@
 	GtkRequisition r;
 	GtkWidget *window;
 	GtkWidget *entry = GTK_WIDGET(entry_);
+	GdkWindow *gdkwin;
 
 	/* Create new window and list */
 	window = gtk_window_new(GTK_WINDOW_POPUP);
@@ -1340,8 +1336,9 @@
 	gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scroll),
 		GTK_SHADOW_OUT);
 	/* Use entry widget to create initial window */
-	gdk_window_get_geometry(entry->window, &x, &y, &width, &height, &depth);
-	gdk_window_get_origin (entry->window, &x, &y);
+	gdkwin = gtk_widget_get_window(entry),
+	gdk_window_get_geometry(gdkwin, &x, &y, &width, &height, &depth);
+	gdk_window_get_origin (gdkwin, &x, &y);
 	y += height;
 	gtk_window_move(GTK_WINDOW(window), x, y);
 
@@ -1368,7 +1365,7 @@
 			 "key-press-event",
 			 G_CALLBACK(completion_window_key_press),
 			 _compWindow_ );
-	gdk_pointer_grab(window->window, TRUE,
+	gdk_pointer_grab(gtk_widget_get_window(window), TRUE,
 			 GDK_POINTER_MOTION_MASK | GDK_BUTTON_PRESS_MASK |
 			 GDK_BUTTON_RELEASE_MASK,
 			 NULL, NULL, GDK_CURRENT_TIME);
@@ -1414,7 +1411,7 @@
 				restore = FALSE;
 				break;
 			}
-			event_widget = event_widget->parent;
+			event_widget = gtk_widget_get_parent(event_widget);
 		}
 	}
 
@@ -1466,7 +1463,7 @@
 	/* make tab move to next field */
 	if( event->keyval == GDK_Tab ) {
 		/* Reference to parent */
-		parent = GTK_WIDGET(entry)->parent;
+		parent = gtk_widget_get_parent(GTK_WIDGET(entry));
 
 		/* Discard the window */
 		clear_completion_cache();
@@ -1482,7 +1479,7 @@
 	/* make backtab move to previous field */
 	if( event->keyval == GDK_ISO_Left_Tab ) {
 		/* Reference to parent */
-		parent = GTK_WIDGET(entry)->parent;
+		parent = gtk_widget_get_parent(GTK_WIDGET(entry));
 
 		/* Discard the window */
 		clear_completion_cache();
@@ -1540,7 +1537,7 @@
 
 	/* make sure anything we typed comes in the edit box */
 	tmp_event.type       = event->type;
-	tmp_event.window     = entry->window;
+	tmp_event.window     = gtk_widget_get_window(GTK_WIDGET(entry));
 	tmp_event.send_event = TRUE;
 	tmp_event.time       = event->time;
 	tmp_event.state      = event->state;

Index: wizard.c
===================================================================
RCS file: /home/claws-mail/claws/src/Attic/wizard.c,v
retrieving revision 1.1.2.84
retrieving revision 1.1.2.85
diff -u -d -r1.1.2.84 -r1.1.2.85
--- wizard.c	3 Jul 2011 17:24:06 -0000	1.1.2.84
+++ wizard.c	7 Oct 2011 09:08:56 -0000	1.1.2.85
@@ -450,7 +450,7 @@
 {
 	GtkWidget *widget = wizard->email;
 	gint size = pango_font_description_get_size(
-			widget->style->font_desc)
+			gtk_widget_get_style(widget)->font_desc)
 		      /PANGO_SCALE;
 	gchar *tmp, *new;
 #ifdef G_OS_WIN32
@@ -1848,7 +1848,7 @@
 	wizard->notebook = gtk_notebook_new();
 	gtk_notebook_set_show_tabs(GTK_NOTEBOOK(wizard->notebook), FALSE);
 	gtk_notebook_set_show_border(GTK_NOTEBOOK(wizard->notebook), FALSE);
-	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(wizard->window)->vbox), 
+	gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(wizard->window))), 
 			    wizard->notebook, TRUE, TRUE, 0);
 	
 	wizard->pages = NULL;

Index: action.c
===================================================================
RCS file: /home/claws-mail/claws/src/action.c,v
retrieving revision 1.12.2.66
retrieving revision 1.12.2.67
diff -u -d -r1.12.2.66 -r1.12.2.67
--- action.c	25 May 2011 10:45:41 -0000	1.12.2.66
+++ action.c	7 Oct 2011 09:08:55 -0000	1.12.2.67
@@ -476,15 +476,22 @@
 
 static GtkWidget *find_item_in_menu(GtkWidget *menu, gchar *name)
 {
-	GList *amenu = GTK_MENU_SHELL(menu)->children;
+	GList *children = gtk_container_get_children(GTK_CONTAINER(GTK_MENU_SHELL(menu)));
+	GList *amenu = children;
 	const gchar *existing_name;
 	while (amenu) {
 		GtkWidget *item = GTK_WIDGET(amenu->data);
 		if ((existing_name = g_object_get_data(G_OBJECT(item), "s_name")) != NULL &&
 		    !strcmp2(name, existing_name))
+		{
+			g_list_free(children);
 			 return item;
+		}
 		amenu = amenu->next;
 	}
+
+	g_list_free(children);
+
 	return NULL;
 }
 
@@ -1324,7 +1331,7 @@
 
 	dialog = gtk_dialog_new();
 	gtk_container_set_border_width
-		(GTK_CONTAINER(GTK_DIALOG(dialog)->action_area), 5);
+		(GTK_CONTAINER(gtk_dialog_get_action_area(GTK_DIALOG(dialog))), 5);
 	gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_CENTER);
 	gtk_window_set_title(GTK_WINDOW(dialog), _("Action's input/output"));
 	gtk_window_set_modal(GTK_WINDOW(dialog), TRUE);
@@ -1336,7 +1343,8 @@
 			 children);
 
 	vbox = gtk_vbox_new(FALSE, 8);
-	gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), vbox);
+	gtk_container_add(GTK_CONTAINER(
+				gtk_dialog_get_content_area(GTK_DIALOG(dialog))), vbox);
 	gtk_container_set_border_width(GTK_CONTAINER(vbox), 8);
 	gtk_widget_show(vbox);
 
@@ -1435,7 +1443,8 @@
 	if (children->nb)
 		gtk_widget_set_sensitive(close_button, FALSE);
 
-	gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->action_area), hbox);
+	gtk_container_add(GTK_CONTAINER(
+			gtk_dialog_get_action_area(GTK_DIALOG(dialog))), hbox);
 
 	children->dialog       = dialog;
 	children->scrolledwin  = scrolledwin;

Index: alertpanel.c
===================================================================
RCS file: /home/claws-mail/claws/src/alertpanel.c,v
retrieving revision 1.17.2.43
retrieving revision 1.17.2.44
diff -u -d -r1.17.2.43 -r1.17.2.44
--- alertpanel.c	16 Feb 2011 07:15:56 -0000	1.17.2.43
+++ alertpanel.c	7 Oct 2011 09:08:55 -0000	1.17.2.44
@@ -268,7 +268,7 @@
 	/* for title icon, label and message */
 	hbox = gtk_hbox_new(FALSE, 12);
 	gtk_container_set_border_width(GTK_CONTAINER(hbox), 12);
-	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox),
+	gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
 			   hbox, FALSE, FALSE, 0);
 
 	/* title icon */
@@ -308,7 +308,7 @@
 		gint size;
 
 		size = pango_font_description_get_size
-			(label->style->font_desc);
+			(gtk_widget_get_style(label)->font_desc);
 		font_desc = pango_font_description_new();
 		pango_font_description_set_weight
 			(font_desc, PANGO_WEIGHT_BOLD);
@@ -337,7 +337,8 @@
 
 	if (can_disable) {
 		hbox = gtk_hbox_new(FALSE, 0);
-		gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox,
+		gtk_box_pack_start(GTK_BOX(
+			gtk_dialog_get_content_area(GTK_DIALOG(dialog))), hbox,
 				   FALSE, FALSE, 0);
 
 		disable_checkbtn = gtk_check_button_new_with_label
@@ -364,7 +365,7 @@
 				      button2_label ? &button2 : NULL, label2,
 				      button3_label ? &button3 : NULL, label3);
 
-	gtk_box_pack_end(GTK_BOX(GTK_DIALOG(dialog)->action_area),
+	gtk_box_pack_end(GTK_BOX(gtk_dialog_get_action_area(GTK_DIALOG(dialog))),
 			 confirm_area, FALSE, FALSE, 0);
 	gtk_container_set_border_width(GTK_CONTAINER(confirm_area), 5);
 	gtk_widget_grab_default(button1);

Index: prefs_summary_column.c
===================================================================
RCS file: /home/claws-mail/claws/src/prefs_summary_column.c,v
retrieving revision 1.10.2.27
retrieving revision 1.10.2.28
diff -u -d -r1.10.2.27 -r1.10.2.28
--- prefs_summary_column.c	16 Feb 2011 07:16:14 -0000	1.10.2.27
+++ prefs_summary_column.c	7 Oct 2011 09:08:56 -0000	1.10.2.28
@@ -806,7 +806,8 @@
 			   -1);
 
 	/* send the type */
-	gtk_selection_data_set(data, data->target, 8, (gchar *) &type, sizeof type);
+	gtk_selection_data_set(data, gtk_selection_data_get_target(data), 8,
+		(gchar *) &type, sizeof type);
 }
 
 static void drag_data_received(GtkTreeView *tree_view, GdkDragContext *context,
@@ -876,7 +877,7 @@
 		gtk_tree_selection_get_selected(gtk_tree_view_get_selection(
 						GTK_TREE_VIEW(source)),
 						&sel_model, &isel);
-		type = *((gint *) data->data);
+		type = *((gint *) gtk_selection_data_get_data(data));
 		name = gettext(col_name[type]);
 		gtk_list_store_remove(GTK_LIST_STORE(sel_model), &isel);
 

Index: compose.c
===================================================================
RCS file: /home/claws-mail/claws/src/compose.c,v
retrieving revision 1.382.2.580
retrieving revision 1.382.2.581
diff -u -d -r1.382.2.580 -r1.382.2.581
--- compose.c	29 Aug 2011 13:00:43 -0000	1.382.2.580
+++ compose.c	7 Oct 2011 09:08:55 -0000	1.382.2.581
@@ -859,7 +859,7 @@
 	color[5] = quote_bgcolor3;
 	color[6] = signature_color;
 	color[7] = uri_color;
-	cmap = gdk_drawable_get_colormap(compose->window->window);
+	cmap = gdk_drawable_get_colormap(gtk_widget_get_window(compose->window));
 	gdk_colormap_alloc_colors(cmap, color, 8, FALSE, TRUE, success);
 
 	for (i = 0; i < 8; i++) {
@@ -6910,7 +6910,7 @@
                                        Compose *compose)
 {
 	gint prev_autowrap;
-	GtkTextBuffer *buffer = GTK_TEXT_VIEW(text)->buffer;
+	GtkTextBuffer *buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
 #if USE_ENCHANT
 	if (event->button == 3) {
 		GtkTextIter iter;
@@ -7867,7 +7867,7 @@
 
 	cm_return_if_fail(GTK_IS_CHECK_MENU_ITEM(widget));
 
-	if (!GTK_CHECK_MENU_ITEM(widget)->active)
+	if (!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget)))
 		return;
 
 	systemid = g_object_get_data(G_OBJECT(widget), "privacy_system");
@@ -7890,7 +7890,7 @@
 {
 	static gchar *branch_path = "/Menu/Options/PrivacySystem";
 	GtkWidget *menuitem = NULL;
-	GList *amenu;
+	GList *children, *amenu;
 	gboolean can_sign = FALSE, can_encrypt = FALSE;
 	gboolean found = FALSE;
 
@@ -7900,11 +7900,10 @@
 				gtk_ui_manager_get_widget(compose->ui_manager, branch_path)));
 		cm_return_if_fail(menuitem != NULL);
 
-		amenu = GTK_MENU_SHELL(menuitem)->children;
+		children = gtk_container_get_children(GTK_CONTAINER(GTK_MENU_SHELL(menuitem)));
+		amenu = children;
 		menuitem = NULL;
 		while (amenu != NULL) {
-		        GList *alist = amenu->next;
-
 			systemid = g_object_get_data(G_OBJECT(amenu->data), "privacy_system");
 			if (systemid != NULL) {
 				if (strcmp(systemid, compose->privacy_system) == 0 &&
@@ -7926,8 +7925,9 @@
 					break;
 			}
 
-			amenu = alist;
+			amenu = amenu->next;
 		}
+		g_list_free(children);
 		if (menuitem != NULL)
 			gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
 		
@@ -8333,6 +8333,7 @@
 
 static void compose_destroy(Compose *compose)
 {
+	GtkAllocation allocation;
 	GtkTextBuffer *buffer;
 	GtkClipboard *clipboard;
 
@@ -8398,8 +8399,9 @@
 #endif
 
 	if (!compose->batch) {
-		prefs_common.compose_width = compose->scrolledwin->allocation.width;
-		prefs_common.compose_height = compose->window->allocation.height;
+		gtk_widget_get_allocation(compose->scrolledwin, &allocation);
+		prefs_common.compose_width = allocation.width;
+		prefs_common.compose_height = allocation.height;
 	}
 
 	if (!gtk_widget_get_parent(compose->paned))
@@ -10406,6 +10408,8 @@
 
 static void compose_grab_focus_cb(GtkWidget *widget, Compose *compose)
 {
+	GtkAllocation allocation;
+	GtkWidget *parent;
 	gchar *str = NULL;
 	
 	if (GTK_IS_EDITABLE(widget)) {
@@ -10413,24 +10417,29 @@
 		gtk_editable_set_position(GTK_EDITABLE(widget), 
 			strlen(str));
 		g_free(str);
-		if (widget->parent && widget->parent->parent
-		 && widget->parent->parent->parent) {
-			if (GTK_IS_SCROLLED_WINDOW(widget->parent->parent->parent)) {
-				gint y = widget->allocation.y;
-				gint height = widget->allocation.height;
+		if ((parent = gtk_widget_get_parent(widget))
+		 && (parent = gtk_widget_get_parent(parent))
+		 && (parent = gtk_widget_get_parent(parent))) {
+			if (GTK_IS_SCROLLED_WINDOW(parent)) {
+				gtk_widget_get_allocation(widget, &allocation);
+				gint y = allocation.y;
+				gint height = allocation.height;
 				GtkAdjustment *shown = gtk_scrolled_window_get_vadjustment
-					(GTK_SCROLLED_WINDOW(widget->parent->parent->parent));
+					(GTK_SCROLLED_WINDOW(parent));
 
-				if (y < (int)shown->value) {
-					gtk_adjustment_set_value(GTK_ADJUSTMENT(shown), y - 1);
+				gfloat value = gtk_adjustment_get_value(shown);
+				gfloat upper = gtk_adjustment_get_upper(shown);
+				gfloat page_size = gtk_adjustment_get_page_size(shown);
+				if (y < (int)value) {
+					gtk_adjustment_set_value(shown, y - 1);
 				}
-				if (y + height > (int)shown->value + (int)shown->page_size) {
-					if (y - height - 1 < (int)shown->upper - (int)shown->page_size) {
-						gtk_adjustment_set_value(GTK_ADJUSTMENT(shown), 
-							y + height - (int)shown->page_size - 1);
+				if ((y + height) > ((int)value + (int)page_size)) {
+					if ((y - height - 1) < ((int)upper - (int)page_size)) {
+						gtk_adjustment_set_value(shown, 
+							y + height - (int)page_size - 1);
 					} else {
-						gtk_adjustment_set_value(GTK_ADJUSTMENT(shown), 
-							(int)shown->upper - (int)shown->page_size - 1);
+						gtk_adjustment_set_value(shown, 
+							(int)upper - (int)page_size - 1);
 					}
 				}
 			}
@@ -10571,14 +10580,17 @@
 {
 	Compose *compose = (Compose *)user_data;
 	GList *list, *tmp;
+	GdkAtom type;
 
-	if (((gdk_atom_name(data->type) && !strcmp(gdk_atom_name(data->type), "text/uri-list"))
+	type = gtk_selection_data_get_data_type(data);
+	if (((gdk_atom_name(type) && !strcmp(gdk_atom_name(type), "text/uri-list"))
 #ifdef G_OS_WIN32
-	 || (gdk_atom_name(data->type) && !strcmp(gdk_atom_name(data->type), "DROPFILES_DND"))
+	 || (gdk_atom_name(type) && !strcmp(gdk_atom_name(type), "DROPFILES_DND"))
 #endif
 	   ) && gtk_drag_get_source_widget(context) != 
 	        summary_get_main_widget(mainwindow_get_mainwindow()->summaryview)) {
-		list = uri_list_extract_filenames((const gchar *)data->data);
+		list = uri_list_extract_filenames(
+			(const gchar *)gtk_selection_data_get_data(data));
 		for (tmp = list; tmp != NULL; tmp = tmp->next) {
 			gchar *utf8_filename = conv_filename_to_utf8((const gchar *)tmp->data);
 			compose_attach_append
@@ -10638,20 +10650,23 @@
 {
 	Compose *compose = (Compose *)user_data;
 	GList *list, *tmp;
+	GdkAtom type;
 
 	/* strangely, testing data->type == gdk_atom_intern("text/uri-list", TRUE)
 	 * does not work */
+	type = gtk_selection_data_get_data_type(data);
 #ifndef G_OS_WIN32
-	if (gdk_atom_name(data->type) && !strcmp(gdk_atom_name(data->type), "text/uri-list")) {
+	if (gdk_atom_name(type) && !strcmp(gdk_atom_name(type), "text/uri-list")) {
 #else
-	if (gdk_atom_name(data->type) && !strcmp(gdk_atom_name(data->type), "DROPFILES_DND")) {
+	if (gdk_atom_name(type) && !strcmp(gdk_atom_name(type), "DROPFILES_DND")) {
 #endif
 		AlertValue val = G_ALERTDEFAULT;
+		const gchar* ddata = (const gchar *)gtk_selection_data_get_data(data);
 
-		list = uri_list_extract_filenames((const gchar *)data->data);
-		if (list == NULL && strstr((gchar *)(data->data), "://")) {
+		list = uri_list_extract_filenames(ddata);
+		if (list == NULL && strstr(ddata, "://")) {
 			/* Assume a list of no files, and data has ://, is a remote link */
-			gchar *tmpdata = g_strstrip(g_strdup((const gchar *)data->data));
+			gchar *tmpdata = g_strstrip(g_strdup(ddata));
 			gchar *tmpfile = get_tmp_file();
 			str_write_to_file(tmpdata, tmpfile);
 			g_free(tmpdata);  
@@ -10725,7 +10740,7 @@
 					     gpointer		 user_data)
 {
 	GtkEditable *entry = (GtkEditable *)user_data;
-	gchar *email = (gchar *)data->data;
+	const gchar *email = (const gchar *)gtk_selection_data_get_data(data);
 
 	/* strangely, testing data->type == gdk_atom_intern("text/plain", TRUE)
 	 * does not work */
@@ -10734,8 +10749,7 @@
 		gchar *decoded=g_new(gchar, strlen(email));
 		int start = 0;
 
-		email += strlen("mailto:");
-		decode_uri(decoded, email); /* will fit */
+		decode_uri(decoded, email + strlen("mailto:")); /* will fit */
 		gtk_editable_delete_text(entry, 0, -1);
 		gtk_editable_insert_text(entry, decoded, strlen(decoded), &start);
 		gtk_drag_finish(drag_context, TRUE, FALSE, time);
@@ -10843,9 +10857,13 @@
 	cm_return_if_fail(compose);
 	cm_return_if_fail(!compose->batch);
 	cm_return_if_fail(GTK_IS_WIDGET(compose->header_table));
-	cm_return_if_fail(GTK_IS_VIEWPORT(compose->header_table->parent));
-	vadj = gtk_viewport_get_vadjustment(GTK_VIEWPORT(compose->header_table->parent));
-	gtk_adjustment_set_value(vadj, (show_first ? vadj->lower : (vadj->upper - vadj->page_size)));
+	cm_return_if_fail(GTK_IS_VIEWPORT(gtk_widget_get_parent(compose->header_table)));
+	vadj = gtk_viewport_get_vadjustment(GTK_VIEWPORT(
+				gtk_widget_get_parent(compose->header_table)));
+	gtk_adjustment_set_value(vadj, (show_first ?
+				gtk_adjustment_get_lower(vadj) :
+				(gtk_adjustment_get_upper(vadj) -
+				gtk_adjustment_get_page_size(vadj))));
 	gtk_adjustment_changed(vadj);
 }
 

Index: stock_pixmap.c
===================================================================
RCS file: /home/claws-mail/claws/src/stock_pixmap.c,v
retrieving revision 1.25.2.68
retrieving revision 1.25.2.69
diff -u -d -r1.25.2.68 -r1.25.2.69
--- stock_pixmap.c	16 Feb 2011 07:16:16 -0000	1.25.2.68
+++ stock_pixmap.c	7 Oct 2011 09:08:56 -0000	1.25.2.69
@@ -593,7 +593,7 @@
 static gboolean pixmap_with_overlay_expose_event_cb(GtkWidget *widget, GdkEventExpose *expose,
 						    OverlayData *data) 
 {
-	GdkDrawable *drawable = widget->window;	
+	GdkDrawable *drawable = gtk_widget_get_window(widget);	
 	cairo_t *cr;
 	gint left = 0;
 	gint top = 0;
@@ -749,11 +749,13 @@
 	GdkPixbuf *stock_pixbuf = NULL;
 	GtkWidget *widget = NULL;
 	GtkWidget *stock_wid = NULL;
+	GtkRequisition requisition;
 	OverlayData *data = NULL;
 	
 	data = g_new0(OverlayData, 1);
 
 	stock_wid = stock_pixmap_widget(window, icon);
+	gtk_widget_get_requisition(stock_wid, &requisition);
 
 	if (gtk_image_get_storage_type(GTK_IMAGE(stock_wid)) == GTK_IMAGE_PIXMAP)
 		data->is_pixmap = TRUE;
@@ -766,8 +768,8 @@
 		g_object_ref(stock_mask);
 		data->base_pixmap = stock_pixmap;
 		data->base_mask   = stock_mask;
-		data->base_height = stock_wid->requisition.height;
-		data->base_width  = stock_wid->requisition.width;
+		data->base_height = requisition.height;
+		data->base_width  = requisition.width;
 		gtk_widget_destroy(stock_wid);
 
 		if (pos == OVERLAY_NONE) {
@@ -780,8 +782,8 @@
 			g_object_ref(stock_mask);
 			data->overlay_pixmap = stock_pixmap;
 			data->overlay_mask   = stock_mask;
-			data->overlay_height = stock_wid->requisition.height;
-			data->overlay_width  = stock_wid->requisition.width;
+			data->overlay_height = requisition.height;
+			data->overlay_width  = requisition.width;
 
 			gtk_widget_destroy(stock_wid);
 		}
@@ -790,8 +792,8 @@
 		stock_pixbuf = gtk_image_get_pixbuf(GTK_IMAGE(stock_wid));
 		g_object_ref(stock_pixbuf);
 		data->base_pixbuf = stock_pixbuf;
-		data->base_height = stock_wid->requisition.height;
-		data->base_width  = stock_wid->requisition.width;
+		data->base_height = requisition.height;
+		data->base_width  = requisition.width;
 		gtk_widget_destroy(stock_wid);
 		if (pos == OVERLAY_NONE) {
 			data->overlay_pixmap = NULL;
@@ -801,8 +803,8 @@
 			stock_pixbuf = gtk_image_get_pixbuf(GTK_IMAGE(stock_wid));
 			g_object_ref(stock_pixbuf);
 			data->overlay_pixbuf = stock_pixbuf;
-			data->overlay_height = stock_wid->requisition.height;
-			data->overlay_width  = stock_wid->requisition.width;
+			data->overlay_height = requisition.height;
+			data->overlay_width  = requisition.width;
 
 			gtk_widget_destroy(stock_wid);
 		}

Index: prefs_toolbar.c
===================================================================
RCS file: /home/claws-mail/claws/src/prefs_toolbar.c,v
retrieving revision 1.30.2.67
retrieving revision 1.30.2.68
diff -u -d -r1.30.2.67 -r1.30.2.68
--- prefs_toolbar.c	10 Apr 2011 17:19:04 -0000	1.30.2.67
+++ prefs_toolbar.c	7 Oct 2011 09:08:56 -0000	1.30.2.68
@@ -1597,7 +1597,7 @@
 				restore = FALSE;
 				break;
 			}
-			event_widget = event_widget->parent;
+			event_widget = gtk_widget_get_parent(event_widget);
 		}
 	}
 
@@ -1616,6 +1616,7 @@
 
 static void icon_chooser_create(GtkButton *button, ToolbarPage *prefs_toolbar)
 {
+	GtkAllocation allocation;
 	GtkWidget *icon_chooser_win;
 	GtkWidget *scrollwin;
 	GtkWidget *icon_view;
@@ -1646,10 +1647,12 @@
 #ifndef MAEMO
 	gtk_window_set_decorated(GTK_WINDOW(icon_chooser_win), FALSE);
 #endif
-	gdk_window_get_origin(GTK_WIDGET(prefs_toolbar->icon_button)->window, 
+	gdk_window_get_origin(gtk_widget_get_window(
+			GTK_WIDGET(prefs_toolbar->icon_button)), 
 			&x, &y);
-	x += GTK_WIDGET(prefs_toolbar->icon_button)->allocation.x;
-	y += GTK_WIDGET(prefs_toolbar->icon_button)->allocation.y;
+	gtk_widget_get_allocation(GTK_WIDGET(prefs_toolbar->icon_button), &allocation);
+	x += allocation.x;
+	y += allocation.y;
 	y += 50;
 	x -= 300-50;
 	gtk_window_move(GTK_WINDOW(icon_chooser_win), x, y);

Index: undo.c
===================================================================
RCS file: /home/claws-mail/claws/src/undo.c,v
retrieving revision 1.13.2.22
retrieving revision 1.13.2.23
diff -u -d -r1.13.2.22 -r1.13.2.23
--- undo.c	16 Feb 2011 07:16:17 -0000	1.13.2.22
+++ undo.c	7 Oct 2011 09:08:56 -0000	1.13.2.23
@@ -311,9 +311,10 @@
 
 	undo_check_size(undostruct);
 
-	vadj = GTK_ADJUSTMENT(GTK_TEXT_VIEW(undostruct->textview)->vadjustment);
+	vadj = GTK_ADJUSTMENT(gtk_text_view_get_vadjustment(
+				GTK_TEXT_VIEW(undostruct->textview)));
 	undoinfo = undo_object_new(g_strdup(text), start_pos, end_pos, action,
-				   vadj->value);
+				   gtk_adjustment_get_value(vadj));
 
 	if (end_pos - start_pos != 1 || text[0] == '\n')
 		undoinfo->mergeable = FALSE;
@@ -366,7 +367,7 @@
 
 	/* Move the view (scrollbars) to the correct position */
 	gtk_adjustment_set_value
-		(GTK_ADJUSTMENT(textview->vadjustment),
+		(GTK_ADJUSTMENT(gtk_text_view_get_vadjustment(textview)),
 		 undoinfo->window_position);
 	
 	switch (undoinfo->action) {
@@ -449,7 +450,7 @@
 	gtk_text_buffer_place_cursor(buffer, &iter);
 
 	/* Move the view to the right position. */
-	gtk_adjustment_set_value(textview->vadjustment, 
+	gtk_adjustment_set_value(gtk_text_view_get_vadjustment(textview), 
 				 redoinfo->window_position);
 
 	switch (redoinfo->action) {

Index: grouplistdialog.c
===================================================================
RCS file: /home/claws-mail/claws/src/grouplistdialog.c,v
retrieving revision 1.14.2.28
retrieving revision 1.14.2.29
diff -u -d -r1.14.2.28 -r1.14.2.29
--- grouplistdialog.c	16 Feb 2011 07:15:59 -0000	1.14.2.28
+++ grouplistdialog.c	7 Oct 2011 09:08:56 -0000	1.14.2.29
@@ -156,7 +156,7 @@
 	dialog = gtk_dialog_new();
 	gtk_window_set_resizable(GTK_WINDOW(dialog), TRUE);
 	gtk_container_set_border_width
-		(GTK_CONTAINER(GTK_DIALOG(dialog)->action_area), 5);
+		(GTK_CONTAINER(gtk_dialog_get_action_area(GTK_DIALOG(dialog))), 5);
 	gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_CENTER);
 	gtk_window_set_title(GTK_WINDOW(dialog), _("Newsgroup subscription"));
 	g_signal_connect(G_OBJECT(dialog), "delete_event",
@@ -168,7 +168,8 @@
 	MANAGE_WINDOW_SIGNALS_CONNECT(dialog);
 
 	vbox = gtk_vbox_new(FALSE, 8);
-	gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), vbox);
+	gtk_container_add(GTK_CONTAINER(
+				gtk_dialog_get_content_area(GTK_DIALOG(dialog))), vbox);
 	gtk_container_set_border_width(GTK_CONTAINER(vbox), 8);
 
 	hbox = gtk_hbox_new(FALSE, 0);
@@ -235,7 +236,7 @@
 				      &refresh_button, GTK_STOCK_REFRESH,
 				      &cancel_button, GTK_STOCK_CANCEL,
 				      &ok_button, GTK_STOCK_OK);
-	gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->action_area),
+	gtk_container_add(GTK_CONTAINER(gtk_dialog_get_action_area(GTK_DIALOG(dialog))),
 			  confirm_area);
 	gtk_widget_grab_default(ok_button);
 
@@ -257,7 +258,7 @@
 					prefs_common.news_subscribe_width,
 					prefs_common.news_subscribe_height);
 
-	gtk_widget_show_all(GTK_DIALOG(dialog)->vbox);
+	gtk_widget_show_all(gtk_dialog_get_content_area(GTK_DIALOG(dialog)));
 }
 
 static GHashTable *branch_node_table;
@@ -401,6 +402,7 @@
 	GSList *cur;
 	GtkCMCTreeNode *node;
 	GPatternSpec *pspec;
+	GdkWindow *window;
 
 	if (locked) return;
 	locked = TRUE;
@@ -410,7 +412,8 @@
 
 	if (!watch_cursor)
 		watch_cursor = gdk_cursor_new(GDK_WATCH);
-	gdk_window_set_cursor(dialog->window, watch_cursor);
+	window = gtk_widget_get_window(dialog);
+	gdk_window_set_cursor(window, watch_cursor);
 	main_window_cursor_wait(mainwindow_get_mainwindow());
 	GTK_EVENTS_FLUSH();
 	
@@ -424,7 +427,7 @@
 		if (group_list == NULL && ack == TRUE) {
 			alertpanel_error(_("Can't retrieve newsgroup list."));
 			locked = FALSE;
-			gdk_window_set_cursor(dialog->window, NULL);
+			gdk_window_set_cursor(window, NULL);
 			main_window_cursor_normal(mainwindow_get_mainwindow());
 			return;
 		}
@@ -461,7 +464,7 @@
 
 	gtk_label_set_text(GTK_LABEL(status_label), _("Done."));
 
-	gdk_window_set_cursor(dialog->window, NULL);
+	gdk_window_set_cursor(window, NULL);
 	main_window_cursor_normal(mainwindow_get_mainwindow());
 
 	locked = FALSE;

Index: image_viewer.c
===================================================================
RCS file: /home/claws-mail/claws/src/Attic/image_viewer.c,v
retrieving revision 1.1.2.30
retrieving revision 1.1.2.31
diff -u -d -r1.1.2.30 -r1.1.2.31
--- image_viewer.c	29 Aug 2011 08:12:10 -0000	1.1.2.30
+++ image_viewer.c	7 Oct 2011 09:08:56 -0000	1.1.2.31
@@ -69,6 +69,7 @@
 
 static void image_viewer_load_file(ImageViewer *imageviewer, const gchar *imgfile)
 {
+	GtkAllocation allocation;
 	GdkPixbufAnimation *animation = NULL;
 	GdkPixbuf *pixbuf = NULL;
 	GError *error = NULL;
@@ -83,10 +84,13 @@
 		g_object_unref(animation);
 		animation = NULL;
 
-		if (imageviewer->resize_img)
+		if (imageviewer->resize_img) {
+			gtk_widget_get_allocation(
+				gtk_widget_get_parent(imageviewer->notebook), &allocation);
 			pixbuf = claws_load_pixbuf_fitting(pixbuf,
-				imageviewer->notebook->parent->allocation.width,
-				imageviewer->notebook->parent->allocation.height);
+				allocation.width,
+				allocation.height);
+		}
 		else
 			pixbuf = claws_load_pixbuf_fitting(pixbuf, -1, -1);
 	}

Index: prefs_filtering_action.c
===================================================================
RCS file: /home/claws-mail/claws/src/prefs_filtering_action.c,v
retrieving revision 1.1.4.69
retrieving revision 1.1.4.70
diff -u -d -r1.1.4.69 -r1.1.4.70
--- prefs_filtering_action.c	10 Apr 2011 17:19:04 -0000	1.1.4.69
+++ prefs_filtering_action.c	7 Oct 2011 09:08:56 -0000	1.1.4.70
@@ -1264,7 +1264,7 @@
 
 	if(enable == TRUE)
 	{
-		if(GTK_IS_COMBO_BOX(widget) || GTK_IS_COMBO_BOX_ENTRY(widget))
+		if(GTK_IS_COMBO_BOX(widget) && gtk_combo_box_get_has_entry(GTK_COMBO_BOX(widget)))
 			gtk_combo_box_set_active(GTK_COMBO_BOX(widget), 0);
 		else if(GTK_IS_SPIN_BUTTON(widget))
 			gtk_spin_button_set_value(GTK_SPIN_BUTTON(widget), 0);

Index: mimeview.c
===================================================================
RCS file: /home/claws-mail/claws/src/mimeview.c,v
retrieving revision 1.83.2.170
retrieving revision 1.83.2.171
diff -u -d -r1.83.2.170 -r1.83.2.171
--- mimeview.c	12 Aug 2011 13:57:41 -0000	1.83.2.170
+++ mimeview.c	7 Oct 2011 09:08:56 -0000	1.83.2.171
@@ -216,7 +216,7 @@
 				       GdkEventVisibility *event,
 				       MimeView *mimeview)
 {
-	gdk_window_set_cursor(widget->window, hand_cursor);
+	gdk_window_set_cursor(gtk_widget_get_window(widget), hand_cursor);
 	return FALSE;
 }
 
@@ -224,7 +224,7 @@
 				      GdkEventCrossing *event,
 				      MimeView *mimeview)
 {
-	gdk_window_set_cursor(widget->window, NULL);
+	gdk_window_set_cursor(gtk_widget_get_window(widget), NULL);
 	return FALSE;
 }
 
@@ -232,7 +232,7 @@
 				      GdkEventCrossing *event,
 				      MimeView *mimeview)
 {
-	gdk_window_set_cursor(widget->window, hand_cursor);
+	gdk_window_set_cursor(gtk_widget_get_window(widget), hand_cursor);
 	return FALSE;
 }
 
@@ -1618,7 +1618,8 @@
 	uriname = g_strconcat(tmp, "\r\n", NULL);
 	g_free(tmp);
 
-	gtk_selection_data_set(selection_data, selection_data->target, 8,
+	gtk_selection_data_set(selection_data, 
+                   gtk_selection_data_get_target(selection_data), 8,
 			       (guchar *)uriname, strlen(uriname));
 
 	g_free(uriname);
@@ -2455,7 +2456,7 @@
 	g_list_free(orig);
 	mimeview->icon_count = 0;
 	adj  = gtk_layout_get_vadjustment(GTK_LAYOUT(mimeview->icon_scroll));
-	gtk_adjustment_set_value(adj, adj->lower);
+	gtk_adjustment_set_value(adj, gtk_adjustment_get_lower(adj));
 	gtk_adjustment_changed(adj);
 }
 
@@ -2467,26 +2468,28 @@
 static void icon_scroll_size_allocate_cb(GtkWidget *widget, 
 					 GtkAllocation *size, MimeView *mimeview)
 {
-	GtkAllocation *mainbox_size;
-	GtkAllocation *vbox_size;
-	GtkAllocation *layout_size;
+	GtkAllocation vbox_size;
+	GtkAllocation layout_size;
 	GtkAdjustment *adj;
+	guint width;
+	guint height;
 
 	adj = gtk_layout_get_vadjustment(GTK_LAYOUT(mimeview->icon_scroll));
 
-	mainbox_size = &mimeview->icon_mainbox->allocation;
-	vbox_size = &mimeview->icon_vbox->allocation;
-	layout_size = &mimeview->icon_scroll->allocation;
+	gtk_widget_get_allocation(mimeview->icon_vbox, &vbox_size);
+	gtk_widget_get_allocation(mimeview->icon_scroll, &layout_size);
 		
+	gtk_layout_get_size(GTK_LAYOUT(mimeview->icon_scroll), &width, &height);
 	gtk_layout_set_size(GTK_LAYOUT(mimeview->icon_scroll), 
-			    GTK_LAYOUT(mimeview->icon_scroll)->width, 
-			    MAX(vbox_size->height, layout_size->height));
-	adj->step_increment = 10;
+			    width, 
+			    MAX(vbox_size.height, layout_size.height));
+	gtk_adjustment_set_step_increment(adj, 10);
 }
 
 static void icon_list_create(MimeView *mimeview, MimeInfo *mimeinfo)
 {
 	GtkRequisition size;
+	GtkRequisition requisition;
 
 	cm_return_if_fail(mimeinfo != NULL);
 
@@ -2501,7 +2504,8 @@
 			 : NULL;
 	}
 	gtk_widget_size_request(mimeview->icon_vbox, &size);
-	if (size.width > mimeview->icon_mainbox->requisition.width) {
+	gtk_widget_get_requisition(mimeview->icon_mainbox, &requisition);
+	if (size.width > requisition.width) {
 		gtk_widget_set_size_request(mimeview->icon_mainbox, 
 					    size.width, -1);
 	}
@@ -2536,6 +2540,7 @@
 static gint mime_toggle_button_cb(GtkWidget *button, GdkEventButton *event,
 				    MimeView *mimeview)
 {
+	GtkAllocation allocation;
 	g_object_ref(button); 
 
 	mimeview_leave_notify(button, NULL, NULL);
@@ -2555,7 +2560,8 @@
 	} else {
 		gtk_arrow_set(GTK_ARROW(gtk_bin_get_child(GTK_BIN((button)))), GTK_ARROW_LEFT, 
 			      GTK_SHADOW_NONE);
-		mimeview->oldsize = mimeview->ctree_mainbox->allocation.height;
+		gtk_widget_get_allocation(mimeview->ctree_mainbox, &allocation);
+		mimeview->oldsize = allocation.height;
 		gtk_widget_hide(mimeview->ctree_mainbox);
 		gtk_widget_show(mimeview->icon_mainbox);
 		gtk_paned_set_position(GTK_PANED(mimeview->paned), 0);
@@ -2564,7 +2570,7 @@
 					button);
 		gtk_box_pack_start(GTK_BOX(mimeview->icon_mainbox), 
 				   button, FALSE, FALSE, 0);
-		gtk_box_reorder_child(GTK_BOX(button->parent), button, 0);
+		gtk_box_reorder_child(GTK_BOX(gtk_widget_get_parent(button)), button, 0);
 		if (mimeview->opened)
 			icon_list_toggle_by_mime_info
 				(mimeview, gtk_cmctree_node_get_row_data(GTK_CMCTREE(mimeview->ctree), 

Index: textview.c
===================================================================
RCS file: /home/claws-mail/claws/src/textview.c,v
retrieving revision 1.96.2.232
retrieving revision 1.96.2.233
diff -u -d -r1.96.2.232 -r1.96.2.233
--- textview.c	29 Aug 2011 08:12:10 -0000	1.96.2.232
+++ textview.c	7 Oct 2011 09:08:56 -0000	1.96.2.233
@@ -233,8 +233,10 @@
 #  define HEIGHT 48
 #endif
 	if (textview->image) {
+		GtkAllocation allocation;
 		gint x, y, x1;
-		x1 = textview->text->allocation.width - WIDTH - 5;
+		gtk_widget_get_allocation(textview->text, &allocation);
+		x1 = allocation.width - WIDTH - 5;
 		gtk_text_view_buffer_to_window_coords(
 			GTK_TEXT_VIEW(textview->text),
 			GTK_TEXT_WINDOW_TEXT, x1, 5, &x, &y);
@@ -603,6 +605,7 @@
 
 static void textview_add_part(TextView *textview, MimeInfo *mimeinfo)
 {
+	GtkAllocation allocation;
 	GtkTextView *text;
 	GtkTextBuffer *buffer;
 	GtkTextIter iter, start_iter;
@@ -710,9 +713,10 @@
 				return;
 			}
 
+			gtk_widget_get_allocation(textview->scrolledwin, &allocation);
 			pixbuf = claws_load_pixbuf_fitting(pixbuf,
-					textview->scrolledwin->allocation.width,
-					textview->scrolledwin->allocation.height);
+					allocation.width,
+					allocation.height);
 
 			if (textview->stop_loading) {
 				return;
@@ -1850,6 +1854,7 @@
 
 static void textview_show_face(TextView *textview)
 {
+	GtkAllocation allocation;
 	GtkTextView *text = GTK_TEXT_VIEW(textview->text);
 	MsgInfo *msginfo = textview->messageview->msginfo;
 	int x = 0;
@@ -1870,7 +1875,8 @@
 
 	gtk_widget_show(textview->image);
 	
-	x = textview->text->allocation.width - WIDTH -5;
+	gtk_widget_get_allocation(textview->text, &allocation);
+	x = allocation.width - WIDTH -5;
 
 	gtk_text_view_add_child_in_window(text, textview->image, 
 		GTK_TEXT_WINDOW_TEXT, x, 5);
@@ -1887,6 +1893,7 @@
 
 void textview_show_icon(TextView *textview, const gchar *stock_id)
 {
+	GtkAllocation allocation;
 	GtkTextView *text = GTK_TEXT_VIEW(textview->text);
 	int x = 0;
 	
@@ -1898,7 +1905,8 @@
 
 	gtk_widget_show(textview->image);
 	
-	x = textview->text->allocation.width - WIDTH -5;
+	gtk_widget_get_allocation(textview->text, &allocation);
+	x = allocation.width - WIDTH -5;
 
 	gtk_text_view_add_child_in_window(text, textview->image, 
 		GTK_TEXT_WINDOW_TEXT, x, 5);
@@ -1989,6 +1997,7 @@
 
 static void textview_show_contact_pic(TextView *textview)
 {
+	GtkAllocation allocation;
 	MsgInfo *msginfo = textview->messageview->msginfo;
 	GtkTextView *text = GTK_TEXT_VIEW(textview->text);
 	int x = 0;
@@ -2040,7 +2049,8 @@
 
 	gtk_widget_show(textview->image);
 	
-	x = textview->text->allocation.width - WIDTH -5;
+	gtk_widget_get_allocation(textview->text, &allocation);
+	x = allocation.width - WIDTH -5;
 
 	gtk_text_view_add_child_in_window(text, textview->image, 
 		GTK_TEXT_WINDOW_TEXT, x, 5);
@@ -2232,7 +2242,7 @@
 void textview_scroll_one_line(TextView *textview, gboolean up)
 {
 	GtkTextView *text = GTK_TEXT_VIEW(textview->text);
-	GtkAdjustment *vadj = text->vadjustment;
+	GtkAdjustment *vadj = gtk_text_view_get_vadjustment(text);
 
 	gtkutils_scroll_one_line(GTK_WIDGET(text), vadj, up);
 }
@@ -2240,7 +2250,7 @@
 gboolean textview_scroll_page(TextView *textview, gboolean up)
 {
 	GtkTextView *text = GTK_TEXT_VIEW(textview->text);
-	GtkAdjustment *vadj = text->vadjustment;
+	GtkAdjustment *vadj = gtk_text_view_get_vadjustment(text);
 
 	return gtkutils_scroll_page(GTK_WIDGET(text), vadj, up);
 }
@@ -2252,6 +2262,7 @@
 static gint textview_key_pressed(GtkWidget *widget, GdkEventKey *event,
 				 TextView *textview)
 {
+	GdkWindow *window;
 	SummaryView *summaryview = NULL;
 	MessageView *messageview = textview->messageview;
 
@@ -2308,11 +2319,12 @@
 		}
 		/* possible fall through */
 	default:
+		window = gtk_widget_get_window(messageview->mainwin->window);
 		if (summaryview &&
-		    event->window != messageview->mainwin->window->window) {
+		    event->window != window) {
 			GdkEventKey tmpev = *event;
 
-			tmpev.window = messageview->mainwin->window->window;
+			tmpev.window = window;
 			KEY_PRESS_EVENT_STOP();
 			gtk_widget_event(messageview->mainwin->window,
 					 (GdkEvent *)&tmpev);
@@ -2330,7 +2342,7 @@
 	if (textview->loading)
 		return FALSE;
 	textview_uri_update(textview, event->x, event->y);
-	gdk_window_get_pointer(widget->window, NULL, NULL, NULL);
+	gdk_window_get_pointer(gtk_widget_get_window(widget), NULL, NULL, NULL);
 
 	return FALSE;
 }
@@ -2363,7 +2375,7 @@
 	if (window != event->window)
 		return FALSE;
 	
-	gdk_window_get_pointer(widget->window, &wx, &wy, NULL);
+	gdk_window_get_pointer(gtk_widget_get_window(widget), &wx, &wy, NULL);
 	textview_uri_update(textview, wx, wy);
 
 	return FALSE;

Index: prefs_folder_column.c
===================================================================
RCS file: /home/claws-mail/claws/src/Attic/prefs_folder_column.c,v
retrieving revision 1.1.2.18
retrieving revision 1.1.2.19
diff -u -d -r1.1.2.18 -r1.1.2.19
--- prefs_folder_column.c	16 Feb 2011 07:16:12 -0000	1.1.2.18
+++ prefs_folder_column.c	7 Oct 2011 09:08:56 -0000	1.1.2.19
@@ -791,7 +791,8 @@
 			   -1);
 
 	/* send the type */
-	gtk_selection_data_set(data, data->target, 8, (gchar *) &type, sizeof type);
+	gtk_selection_data_set(data, gtk_selection_data_get_target(data), 8,
+		(gchar *) &type, sizeof type);
 }
 
 static void drag_data_received(GtkTreeView *tree_view, GdkDragContext *context,
@@ -861,7 +862,7 @@
 		gtk_tree_selection_get_selected(gtk_tree_view_get_selection(
 						GTK_TREE_VIEW(source)),
 						&sel_model, &isel);
-		type = *((gint *) data->data);
+		type = *((gint *) gtk_selection_data_get_data(data));
 		name = gettext(col_name[type]);
 		gtk_list_store_remove(GTK_LIST_STORE(sel_model), &isel);
 

Index: addressbook.c
===================================================================
RCS file: /home/claws-mail/claws/src/addressbook.c,v
retrieving revision 1.60.2.143
retrieving revision 1.60.2.144
diff -u -d -r1.60.2.143 -r1.60.2.144
--- addressbook.c	10 Apr 2011 17:19:03 -0000	1.60.2.143
+++ addressbook.c	7 Oct 2011 09:08:55 -0000	1.60.2.144
@@ -5618,11 +5618,11 @@
 	if (aio && aio->type == ADDR_ITEM_PERSON) {
 		if( ds && ds->interface && ds->interface->readOnly)
 			gtk_selection_data_set(selection_data,
-				       selection_data->target, 8,
+				       gtk_selection_data_get_target(selection_data), 8,
 				       (const guchar *)"Dummy_addr_copy", 15);
 		else
 			gtk_selection_data_set(selection_data,
-				       selection_data->target, 8,
+				       gtk_selection_data_get_target(selection_data), 8,
 				       (const guchar *)"Dummy_addr_move", 15);
 	} 
 }
@@ -5634,14 +5634,18 @@
 					  guint           time,
 					  void            *data)
 {
+	GtkAllocation allocation;
+	GtkRequisition requisition;
 	gint row, column;
 	GtkCMCTreeNode *node = NULL;
 	gboolean acceptable = FALSE;
-	gint height = addrbook.ctree->allocation.height;
-	gint total_height = addrbook.ctree->requisition.height;
+	gtk_widget_get_allocation(GTK_WIDGET(addrbook.ctree), &allocation);
+	gint height = allocation.height;
+	gtk_widget_get_requisition(GTK_WIDGET(addrbook.ctree), &requisition);
+	gint total_height = requisition.height;
 	GtkAdjustment *pos = gtk_scrolled_window_get_vadjustment(
 				GTK_SCROLLED_WINDOW(addrbook.ctree_swin));
-	gfloat vpos = pos->value;
+	gfloat vpos = gtk_adjustment_get_value(pos);
 	
 	if (gtk_cmclist_get_selection_info
 		(GTK_CMCLIST(widget), x - 24, y - 24, &row, &column)) {
@@ -5683,7 +5687,7 @@
 			(G_OBJECT(widget),
 			 G_CALLBACK(addressbook_tree_selected), NULL);
 		gdk_drag_status(context, 
-					(context->actions == GDK_ACTION_COPY ?
+					(gdk_drag_context_get_actions(context) == GDK_ACTION_COPY ?
 					GDK_ACTION_COPY : GDK_ACTION_MOVE) , time);
 	} else {
 		gdk_drag_status(context, 0, time);
@@ -5721,7 +5725,7 @@
 	GtkCMCTreeNode *node;
 	GtkCMCTreeNode *lastopened = addrbook.opened;
 
-	if (!strncmp(data->data, "Dummy_addr", 10)) {
+	if (!strncmp(gtk_selection_data_get_data(data), "Dummy_addr", 10)) {
 		if (gtk_cmclist_get_selection_info
 			(GTK_CMCLIST(widget), x - 24, y - 24, &row, &column) == 0) {
 			return;
@@ -5732,8 +5736,8 @@
 			return;
 		
 		gtk_cmclist_freeze(GTK_CMCLIST(addrbook.clist));
-		if (drag_context->action == GDK_ACTION_COPY || 
-		    !strcmp(data->data, "Dummy_addr_copy"))
+		if (gdk_drag_context_get_selected_action(drag_context) == GDK_ACTION_COPY || 
+		    !strcmp(gtk_selection_data_get_data(data), "Dummy_addr_copy"))
 			addressbook_clip_copy_cb(NULL, NULL);
 		else
 			addressbook_clip_cut_cb(NULL, NULL);

Index: folderview.c
===================================================================
RCS file: /home/claws-mail/claws/src/folderview.c,v
retrieving revision 1.207.2.220
retrieving revision 1.207.2.221
diff -u -d -r1.207.2.220 -r1.207.2.221
--- folderview.c	10 Apr 2011 08:07:07 -0000	1.207.2.220
+++ folderview.c	7 Oct 2011 09:08:56 -0000	1.207.2.221
@@ -1080,7 +1080,7 @@
 	if (folderview) {
 		pos = gtk_scrolled_window_get_vadjustment(
 					GTK_SCROLLED_WINDOW(folderview->scrolledwin));
-		height = pos->value;
+		height = gtk_adjustment_get_value(pos);
 	}
 
 	folder_set_ui_func(folder, folderview_scan_tree_func, NULL);
@@ -1121,7 +1121,7 @@
 	if (folderview) {
 		pos = gtk_scrolled_window_get_vadjustment(
 					GTK_SCROLLED_WINDOW(folderview->scrolledwin));
-		height = pos->value;
+		height = gtk_adjustment_get_value(pos);
 	}
 
 	folder_set_ui_func(folder, folderview_scan_tree_func, NULL);
@@ -2647,7 +2647,7 @@
 	FolderItem *item = folderview_get_selected_item(folderview);
 	GtkAdjustment *pos = gtk_scrolled_window_get_vadjustment(
 				GTK_SCROLLED_WINDOW(folderview->scrolledwin));
-	gint height = pos->value;
+	gint height = gtk_adjustment_get_value(pos);
 
 	if (!last_smallfont || strcmp(last_smallfont, SMALL_FONT) ||
 			!last_normalfont || strcmp(last_normalfont, NORMAL_FONT) ||
@@ -2770,7 +2770,7 @@
 			if (item) {
 				source = g_strdup_printf ("FROM_OTHER_FOLDER%s", folder_item_get_identifier(item));
 				gtk_selection_data_set(selection_data,
-						       selection_data->target, 8,
+						       gtk_selection_data_get_target(selection_data), 8,
 						       source, strlen(source));
 				break;
 			} else
@@ -2823,8 +2823,9 @@
 	FolderView *folderview = (FolderView *)data;
 	GtkAdjustment *pos = gtk_scrolled_window_get_vadjustment(
 				GTK_SCROLLED_WINDOW(folderview->scrolledwin));
-	gint new_val = (int)pos->value + folderview->scroll_value;
-	gint max = (int)pos->upper - (int)pos->page_size;
+	gint new_val = (int)gtk_adjustment_get_value(pos) + folderview->scroll_value;
+	gint max = (int)gtk_adjustment_get_upper(pos) -
+               (int)gtk_adjustment_get_page_size(pos);
 
 	if (folderview->scroll_value == 0) {
 		folderview->scroll_timeout_id = -1;
@@ -2854,9 +2855,9 @@
 	gboolean acceptable = FALSE;
 	GtkAdjustment *pos = gtk_scrolled_window_get_vadjustment(
 				GTK_SCROLLED_WINDOW(folderview->scrolledwin));
-	int height = (int)pos->page_size;
-	int total_height = (int)pos->upper;
-	int vpos = (int) pos->value;
+	int height = (int)gtk_adjustment_get_page_size(pos);
+	int total_height = (int)gtk_adjustment_get_upper(pos);
+	int vpos = (int)gtk_adjustment_get_value(pos);
 	int offset = prefs_common.show_col_headers ? 24:0;
 	int dist;
 
@@ -2925,7 +2926,7 @@
 			(G_OBJECT(widget),
 			 G_CALLBACK(folderview_selected), folderview);
 		gdk_drag_status(context, 
-					(context->actions == GDK_ACTION_COPY ?
+					(gdk_drag_context_get_actions(context) == GDK_ACTION_COPY ?
 					GDK_ACTION_COPY : GDK_ACTION_MOVE) , time);
 	} else {
 		if (folderview->opened)
@@ -3013,7 +3014,8 @@
 
 	if (info == TARGET_DUMMY) {
 		drag_state_stop(folderview);
-		if ((void *)strstr(data->data, "FROM_OTHER_FOLDER") != (void *)data->data) {
+		const gchar *ddata = (const gchar *)gtk_selection_data_get_data(data);
+		if ((gchar *)strstr(ddata, "FROM_OTHER_FOLDER") != ddata) {
 			/* comes from summaryview */
 			if (gtk_cmclist_get_selection_info
 				(GTK_CMCLIST(widget), x - offset, y - offset, &row, &column) == 0)
@@ -3034,7 +3036,7 @@
 				return;
 			}
 			if (item && src_item) {
-				switch (drag_context->action) {
+				switch (gdk_drag_context_get_selected_action(drag_context)) {
 				case GDK_ACTION_COPY:
 					summary_copy_selected_to(folderview->summaryview, item);
 					gtk_drag_finish(drag_context, TRUE, FALSE, time);
@@ -3054,9 +3056,10 @@
 			/* comes from folderview */
 			char *source;
 			gboolean folder_is_normal = TRUE;
-			gboolean copy = (drag_context->action == GDK_ACTION_COPY);
+			gboolean copy = (GDK_ACTION_COPY ==
+				gdk_drag_context_get_selected_action(drag_context));
 
-			source = data->data + 17;
+			source = (char *)gtk_selection_data_get_data(data) + 17;
 			if (gtk_cmclist_get_selection_info
 			    (GTK_CMCLIST(widget), x - offset, y - offset, &row, &column) == 0
 			    || *source == 0) {
@@ -3100,7 +3103,8 @@
 			debug_print("no item\n");
 			return;
 		}
-		folderview_finish_dnd(data->data, drag_context, time, item);
+		folderview_finish_dnd(gtk_selection_data_get_data(data),
+			drag_context, time, item);
 	}
 }
 

Index: account.c
===================================================================
RCS file: /home/claws-mail/claws/src/account.c,v
retrieving revision 1.61.2.98
retrieving revision 1.61.2.99
diff -u -d -r1.61.2.98 -r1.61.2.99
--- account.c	29 Aug 2011 13:00:43 -0000	1.61.2.98
+++ account.c	7 Oct 2011 09:08:55 -0000	1.61.2.99
@@ -1531,7 +1531,7 @@
 		 NULL);
 	gtk_tree_view_append_column(GTK_TREE_VIEW(list_view), column);		
 	gtk_tree_view_column_set_alignment (column, 0.5);
-	CLAWS_SET_TIP(column->button,
+	CLAWS_SET_TIP(gtk_tree_view_column_get_widget(column),
 			_("'Get Mail' retrieves mail from the checked accounts"));
 	g_signal_connect(G_OBJECT(renderer), "toggled", 		     
 			 G_CALLBACK(account_get_all_toggled),

Index: mainwindow.c
===================================================================
RCS file: /home/claws-mail/claws/src/mainwindow.c,v
retrieving revision 1.274.2.328
retrieving revision 1.274.2.329
diff -u -d -r1.274.2.328 -r1.274.2.329
--- mainwindow.c	31 Aug 2011 16:54:53 -0000	1.274.2.328
+++ mainwindow.c	7 Oct 2011 09:08:56 -0000	1.274.2.329
@@ -892,7 +892,7 @@
 	GtkMenuShell *menu;
 	GtkCheckMenuItem **items;
 	gint n;
-	GList *cur;
+	GList *children, *cur;
 	GSList *sel;
 
 	mainwin = (MainWindow *)data;
@@ -912,7 +912,8 @@
 			  GINT_TO_POINTER(1));
 
 	/* clear items. get item pointers. */
-	for (n = 0, cur = menu->children; cur != NULL && cur->data != NULL; cur = cur->next) {
+	children = gtk_container_get_children(GTK_CONTAINER(menu));
+	for (n = 0, cur = children; cur != NULL && cur->data != NULL; cur = cur->next) {
 		if (GTK_IS_CHECK_MENU_ITEM(cur->data)) {
 			gtk_check_menu_item_set_active
 				(GTK_CHECK_MENU_ITEM(cur->data), FALSE);
@@ -921,6 +922,8 @@
 		}
 	}
 
+	g_list_free(children);
+
 	if (n == (N_COLOR_LABELS + 1)) {
 		/* iterate all messages and set the state of the appropriate
 		 * items */
@@ -931,7 +934,7 @@
 			msginfo = (MsgInfo *)sel->data;
 			if (msginfo) {
 				clabel = MSG_GET_COLORLABEL_VALUE(msginfo->flags);
-				if (!items[clabel]->active)
+				if (!gtk_check_menu_item_get_active(items[clabel]))
 					gtk_check_menu_item_set_active
 						(items[clabel], TRUE);
 			}
@@ -967,7 +970,7 @@
 {
 	MainWindow *mainwin;
 	GtkMenuShell *menu;
-	GList *cur;
+	GList *children, *cur;
 	GSList *sel;
 	GHashTable *menu_table = g_hash_table_new_full(
 					g_direct_hash,
@@ -993,7 +996,8 @@
 			  GINT_TO_POINTER(1));
 
 	/* clear items. get item pointers. */
-	for (cur = menu->children; cur != NULL && cur->data != NULL; cur = cur->next) {
+	children = gtk_container_get_children(GTK_CONTAINER(menu));
+	for (cur = children; cur != NULL && cur->data != NULL; cur = cur->next) {
 		if (GTK_IS_CHECK_MENU_ITEM(cur->data)) {
 			gint id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(cur->data),
 				"tag_id"));
@@ -1005,6 +1009,8 @@
 		}
 	}
 
+	g_list_free(children);
+
 	/* iterate all messages and set the state of the appropriate
 	 * items */
 	sel_len = 0;
@@ -1024,7 +1030,7 @@
 				gint num_checked = GPOINTER_TO_INT(g_hash_table_lookup(menu_allsel_table, tags->data));
 				id = GPOINTER_TO_INT(tags->data);
 				item = g_hash_table_lookup(menu_table, GINT_TO_POINTER(tags->data));
-				if (item && !item->active) {
+				if (item && !gtk_check_menu_item_get_active(item)) {
 					gtk_check_menu_item_set_active
 						(item, TRUE);
 				}
@@ -1034,7 +1040,8 @@
 		}
 	}
 
-	for (cur = menu->children; cur != NULL && cur->data != NULL; cur = cur->next) {
+	children = gtk_container_get_children(GTK_CONTAINER(menu));
+	for (cur = children; cur != NULL && cur->data != NULL; cur = cur->next) {
 		if (GTK_IS_CHECK_MENU_ITEM(cur->data)) {
 			gint id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(cur->data),
 				"tag_id"));
@@ -1045,6 +1052,7 @@
 				gtk_check_menu_item_set_inconsistent(GTK_CHECK_MENU_ITEM(cur->data), FALSE);
 		}
 	}
+	g_list_free(children);
 	g_slist_free(sel);
 	g_hash_table_destroy(menu_table);
 	g_hash_table_destroy(menu_allsel_table);
@@ -1281,7 +1289,7 @@
 				       GdkEventVisibility *event,
 				       MainWindow *mainwindow)
 {
-	gdk_window_set_cursor(mainwindow->warning_btn->window, hand_cursor);
+	gdk_window_set_cursor(gtk_widget_get_window(mainwindow->warning_btn), hand_cursor);
 	return FALSE;
 }
 
@@ -1289,7 +1297,7 @@
 				      GdkEventCrossing *event,
 				      MainWindow *mainwindow)
 {
-	gdk_window_set_cursor(mainwindow->warning_btn->window, NULL);
+	gdk_window_set_cursor(gtk_widget_get_window(mainwindow->warning_btn), NULL);
 	return FALSE;
 }
 
@@ -1297,7 +1305,7 @@
 				      GdkEventCrossing *event,
 				      MainWindow *mainwindow)
 {
-	gdk_window_set_cursor(mainwindow->warning_btn->window, hand_cursor);
+	gdk_window_set_cursor(gtk_widget_get_window(mainwindow->warning_btn), hand_cursor);
 	return FALSE;
 }
 #endif
@@ -2198,7 +2206,7 @@
 	color[2] = folderview->color_new;
 	color[3] = folderview->color_op;
 
-	colormap = gdk_drawable_get_colormap(window->window);
+	colormap = gdk_drawable_get_colormap(gtk_widget_get_window(window));
 	gdk_colormap_alloc_colors(colormap, color, 4, FALSE, TRUE, success);
 	for (i = 0; i < 4; i++) {
 		if (success[i] == FALSE)
@@ -2339,7 +2347,7 @@
 {
 
 	if (mainwin->cursor_count == 0) {
-		gdk_window_set_cursor(mainwin->window->window, watch_cursor);
+		gdk_window_set_cursor(gtk_widget_get_window(mainwin->window), watch_cursor);
 		textview_cursor_wait(mainwin->messageview->mimeview->textview);
 	}
 	
@@ -2354,7 +2362,7 @@
 		mainwin->cursor_count--;
 
 	if (mainwin->cursor_count == 0) {
-		gdk_window_set_cursor(mainwin->window->window, NULL);
+		gdk_window_set_cursor(gtk_widget_get_window(mainwin->window), NULL);
 		textview_cursor_normal(mainwin->messageview->mimeview->textview);
 	}
 	gdk_flush();
@@ -2472,20 +2480,22 @@
 void main_window_reflect_prefs_custom_colors(MainWindow *mainwin)
 {
 	GtkMenuShell *menu;
-	GList *cur;
+	GList *children, *cur;
 
 	/* re-create colorlabel submenu */
 	menu = GTK_MENU_SHELL(mainwin->colorlabel_menu);
 	cm_return_if_fail(menu != NULL);
 
 	/* clear items. get item pointers. */
-	for (cur = menu->children; cur != NULL && cur->data != NULL; cur = cur->next) {
+	children = gtk_container_get_children(GTK_CONTAINER(menu));
+	for (cur = children; cur != NULL && cur->data != NULL; cur = cur->next) {
 		g_signal_handlers_disconnect_matched
 			 (gtk_ui_manager_get_accel_group(mainwin->ui_manager), 
 			 G_SIGNAL_MATCH_DATA|G_SIGNAL_MATCH_FUNC,
 			 0, 0, NULL, mainwin_accel_changed_cb, cur->data);
 		gtk_menu_item_set_submenu(GTK_MENU_ITEM(cur->data), NULL);
 	}
+	g_list_free(children);
 	mainwindow_colorlabel_menu_create(mainwin, TRUE);
 	summary_reflect_prefs_custom_colors(mainwin->summaryview);
 	folderview_reinit_fonts(mainwin->folderview);
@@ -2495,7 +2505,7 @@
 static gboolean main_window_reflect_tags_changes_real(gpointer data)
 {
 	GtkMenuShell *menu;
-	GList *cur;
+	GList *children, *cur;
 	MainWindow *mainwin = (MainWindow *)data;
 
 	if (summary_is_locked(mainwin->summaryview)) {
@@ -2507,9 +2517,11 @@
 	cm_return_val_if_fail(menu != NULL, FALSE);
 
 	/* clear items. get item pointers. */
-	for (cur = menu->children; cur != NULL && cur->data != NULL; cur = cur->next) {
+	children = gtk_container_get_children(GTK_CONTAINER(menu));
+	for (cur = children; cur != NULL && cur->data != NULL; cur = cur->next) {
 		gtk_menu_item_set_submenu(GTK_MENU_ITEM(cur->data), NULL);
 	}
+	g_list_free(children);
 	mainwindow_tags_menu_create(mainwin, TRUE);
 	summary_reflect_tags_changes(mainwin->summaryview);
 	
@@ -2590,7 +2602,7 @@
 static void main_window_set_account_receive_menu(MainWindow *mainwin,
 						 GList *account_list)
 {
-	GList *cur_ac, *cur_item;
+	GList *children, *child;
 	GtkWidget *menu;
 	GtkWidget *menuitem;
 	PrefsAccount *ac_prefs;
@@ -2599,23 +2611,24 @@
 		gtk_ui_manager_get_widget(mainwin->ui_manager, "/Menu/Message/Receive")));
 
 	/* search for separator */
-	for (cur_item = GTK_MENU_SHELL(menu)->children; cur_item != NULL;
-	     cur_item = cur_item->next) {
-		if (cur_item->data == gtk_ui_manager_get_widget(mainwin->ui_manager, "/Menu/Message/Receive/Separator1")) {
-			cur_item = cur_item->next;
+	children = gtk_container_get_children(GTK_CONTAINER(menu));
+	for (child = children; child != NULL; child = child->next) {
+		if (child->data == gtk_ui_manager_get_widget(mainwin->ui_manager, "/Menu/Message/Receive/Separator1")) {
+			child = child->next;
 			break;
 		}
 	}
 
 	/* destroy all previous menu item */
-	while (cur_item != NULL) {
-		GList *next = cur_item->next;
-		gtk_widget_destroy(GTK_WIDGET(cur_item->data));
-		cur_item = next;
+	while (child != NULL) {
+		gtk_widget_destroy(GTK_WIDGET(child->data));
+		child = child->next;
 	}
 
-	for (cur_ac = account_list; cur_ac != NULL; cur_ac = cur_ac->next) {
-		ac_prefs = (PrefsAccount *)cur_ac->data;
+	g_list_free(children);
+
+	for (child = account_list; child != NULL; child = child->next) {
+		ac_prefs = (PrefsAccount *)child->data;
 
 		if (ac_prefs->protocol == A_NONE)
 			continue;
@@ -2767,11 +2780,11 @@
 	g_object_ref(summary_wid);
 	g_object_ref(message_wid);
 	gtkut_container_remove
-		(GTK_CONTAINER(folder_wid->parent), folder_wid);
+		(GTK_CONTAINER(gtk_widget_get_parent(folder_wid)), folder_wid);
 	gtkut_container_remove
-		(GTK_CONTAINER(summary_wid->parent), summary_wid);
+		(GTK_CONTAINER(gtk_widget_get_parent(summary_wid)), summary_wid);
 	gtkut_container_remove
-		(GTK_CONTAINER(message_wid->parent), message_wid);
+		(GTK_CONTAINER(gtk_widget_get_parent(message_wid)), message_wid);
 
 	gtk_widget_hide(mainwin->window);
 	main_window_set_widgets(mainwin, layout_mode);
@@ -2842,7 +2855,7 @@
 	case SMALL_LAYOUT:
 		ppaned = mainwin->vpaned;
 		container = mainwin->hpaned;
-		if (ppaned->parent != NULL) {
+		if (gtk_widget_get_parent(ppaned) != NULL) {
 			mainwin->messageview->visible = FALSE;
 			summaryview->displayed = NULL;
 			g_object_ref(ppaned);
@@ -2858,7 +2871,7 @@
 	case WIDE_LAYOUT:
 		ppaned = mainwin->hpaned;
 		container = mainwin->vpaned;
-		if (mainwin->messageview->vbox->parent != NULL) {
+		if (gtk_widget_get_parent(mainwin->messageview->vbox) != NULL) {
 			mainwin->messageview->visible = FALSE;
 			summaryview->displayed = NULL;
 			g_object_ref(mainwin->messageview->vbox);
@@ -2900,7 +2913,7 @@
 
 void main_window_get_size(MainWindow *mainwin)
 {
-	GtkAllocation *allocation;
+	GtkAllocation allocation;
 
 	if (mainwin_list == NULL || mainwin->messageview == NULL) {
 		debug_print("called after messageview "
@@ -2908,41 +2921,41 @@
 		return;
 	}
 
-	allocation = &(GTK_WIDGET_PTR(mainwin->summaryview)->allocation);
-	
 	if (prefs_common.mainwin_fullscreen) {
 		debug_print("mainwin in full screen state. "
 			    "Keeping original settings\n");
 	}
-	if (allocation->width > 1 && allocation->height > 1 && !prefs_common.mainwin_fullscreen) {
-		prefs_common.summaryview_width = allocation->width;
+
+	gtk_widget_get_allocation(GTK_WIDGET_PTR(mainwin->summaryview), &allocation);
+	if (allocation.width > 1 && allocation.height > 1 && !prefs_common.mainwin_fullscreen) {
+		prefs_common.summaryview_width = allocation.width;
 
 		if (messageview_is_visible(mainwin->messageview))
-			prefs_common.summaryview_height = allocation->height;
+			prefs_common.summaryview_height = allocation.height;
 
-		prefs_common.mainview_width = allocation->width;
+		prefs_common.mainview_width = allocation.width;
 	}
 
-	allocation = &mainwin->window->allocation;
-	if (allocation->width > 1 && allocation->height > 1 &&
+	gtk_widget_get_allocation(mainwin->window, &allocation);
+	if (allocation.width > 1 && allocation.height > 1 &&
 	    !prefs_common.mainwin_maximised && !prefs_common.mainwin_fullscreen) {
-		prefs_common.mainview_height = allocation->height;
-		prefs_common.mainwin_width   = allocation->width;
-		prefs_common.mainwin_height  = allocation->height;
+		prefs_common.mainview_height = allocation.height;
+		prefs_common.mainwin_width   = allocation.width;
+		prefs_common.mainwin_height  = allocation.height;
 	}
 
-	allocation = &(GTK_WIDGET_PTR(mainwin->folderview)->allocation);
-	if (allocation->width > 1 && allocation->height > 1 &&
+	gtk_widget_get_allocation(GTK_WIDGET_PTR(mainwin->folderview), &allocation);
+	if (allocation.width > 1 && allocation.height > 1 &&
 	    !prefs_common.mainwin_fullscreen) {
-		prefs_common.folderview_width  = allocation->width;
-		prefs_common.folderview_height = allocation->height;
+		prefs_common.folderview_width  = allocation.width;
+		prefs_common.folderview_height = allocation.height;
 	}
 
-	allocation = &(GTK_WIDGET_PTR(mainwin->messageview)->allocation);
-	if (allocation->width > 1 && allocation->height > 1 &&
+	gtk_widget_get_allocation(GTK_WIDGET_PTR(mainwin->messageview), &allocation);
+	if (allocation.width > 1 && allocation.height > 1 &&
 	    !prefs_common.mainwin_fullscreen) {
-		prefs_common.msgview_width = allocation->width;
-		prefs_common.msgview_height = allocation->height;
+		prefs_common.msgview_width = allocation.width;
+		prefs_common.msgview_height = allocation.height;
 	}
 
 /*	debug_print("summaryview size: %d x %d\n",
@@ -3182,7 +3195,7 @@
 	SummaryView *summaryview;
 	gchar *menu_path;
 	GtkWidget *menu;
-	GList *cur_item;
+	GList *children, *cur_item;
 	gint i;
 
 	static const struct {
@@ -3288,8 +3301,8 @@
 	menu = gtk_menu_item_get_submenu(GTK_MENU_ITEM(
 		gtk_ui_manager_get_widget(mainwin->ui_manager, "/Menu/Message/Receive")));
 
-	for (cur_item = GTK_MENU_SHELL(menu)->children; cur_item != NULL;
-	     cur_item = cur_item->next) {
+	children = gtk_container_get_children(GTK_CONTAINER(menu));
+	for (cur_item = children; cur_item != NULL; cur_item = cur_item->next) {
 		if (cur_item->data == gtk_ui_manager_get_widget(mainwin->ui_manager, "/Menu/Message/Receive/Separator1")) {
 			cur_item = cur_item->next;
 			break;
@@ -3301,6 +3314,8 @@
 					 (M_UNLOCKED & state) != 0);
 	}
 
+	g_list_free(children);
+
 	main_window_menu_callback_block(mainwin);
 
 	cm_toggle_menu_set_active_full(mainwin->ui_manager, "Menu/View/ShowHide/MessageView",
@@ -3440,19 +3455,19 @@
 	GtkWidget *item, *menu;
 	const gchar *url_pt ;
 	gchar url_decoded[BUFFSIZE];
-	GList *amenu, *alist;
+	GList *children, *amenu;
 	gint menu_nb = 0;
 	
 	menu = gtk_menu_item_get_submenu(GTK_MENU_ITEM(menuitem));
 	
 	/* First delete old submenu */
 	/* FIXME: we can optimize this, and only change/add/delete necessary items */
-	for (amenu = (GTK_MENU_SHELL(menu)->children) ; amenu; ) {
-		alist = amenu->next;
+	children = gtk_container_get_children(GTK_CONTAINER(menu));
+	for (amenu = children; amenu; amenu = amenu->next) {
 		item = GTK_WIDGET (amenu->data);
 		gtk_widget_destroy (item);
-		amenu = alist;
 	}
+	g_list_free(children);
 	if (list_header) {
 		for (url_pt = list_header; url_pt && *url_pt;) {
 			get_url_part (&url_pt, url_decoded, BUFFSIZE);
@@ -3681,7 +3696,7 @@
 #endif
 	/* clean top-most container */
 	if (mainwin->hpaned) {
-		if (mainwin->hpaned->parent == mainwin->vpaned)
+		if (gtk_widget_get_parent(mainwin->hpaned) == mainwin->vpaned)
 			gtk_widget_destroy(mainwin->vpaned);
 		else
 			gtk_widget_destroy(mainwin->hpaned);

Index: printing.c
===================================================================
RCS file: /home/claws-mail/claws/src/Attic/printing.c,v
retrieving revision 1.1.2.31
retrieving revision 1.1.2.32
diff -u -d -r1.1.2.31 -r1.1.2.32
--- printing.c	16 Feb 2011 07:16:14 -0000	1.1.2.31
+++ printing.c	7 Oct 2011 09:08:56 -0000	1.1.2.32
@@ -537,7 +537,7 @@
 	preview_data->area = da;
 
 	/* cairo context */
-	cr = gdk_cairo_create(da->window);
+	cr = gdk_cairo_create(gtk_widget_get_window(da));
 	gtk_print_context_set_cairo_context(context, cr, PREVIEW_SCALE, PREVIEW_SCALE);
 	cairo_destroy(cr);
 
@@ -663,7 +663,7 @@
 
 	debug_print("preview_expose (current %p)\n", preview_data->current_page);
 
-	cr = gdk_cairo_create(preview_data->area->window);
+	cr = gdk_cairo_create(gtk_widget_get_window(preview_data->area));
 
 	/* background */
 	cairo_set_source_rgb(cr, 0.5, 0.5, 0.5);
@@ -768,13 +768,15 @@
 static void cb_preview_zoom_fit(GtkButton *button, gpointer data)
 {
 	PreviewData *preview_data = (PreviewData*) data;
+	GtkAllocation allocation;
 	gdouble zoom_w;
 	gdouble zoom_h;
 
-	zoom_w = ((gdouble)preview_data->scrolled_window->allocation.width) /
+	gtk_widget_get_allocation(preview_data->scrolled_window, &allocation);
+	zoom_w = ((gdouble)allocation.width) /
 		 ((gdouble)preview_data->page_width/preview_data->print_data->zoom +
 		  PREVIEW_SHADOW_OFFSET);
-	zoom_h = ((gdouble)preview_data->scrolled_window->allocation.height) /
+	zoom_h = ((gdouble)allocation.height) /
 		 ((gdouble)preview_data->page_height/preview_data->print_data->zoom +
 		  PREVIEW_SHADOW_OFFSET);
 

Index: prefs_msg_colors.c
===================================================================
RCS file: /home/claws-mail/claws/src/prefs_msg_colors.c,v
retrieving revision 1.1.2.42
retrieving revision 1.1.2.43
diff -u -d -r1.1.2.42 -r1.1.2.43
--- prefs_msg_colors.c	16 Feb 2011 07:16:13 -0000	1.1.2.42
+++ prefs_msg_colors.c	7 Oct 2011 09:08:56 -0000	1.1.2.43
@@ -579,6 +579,8 @@
 	GdkColor color;
 	gint rgbvalue = 0;
 	GtkColorSelectionDialog *dialog;
+	GtkWidget button_ok;
+	GtkWidget button_cancel;
 	gint c;
 
 	/* custom colors */
@@ -638,9 +640,13 @@
 	gtk_window_set_resizable(GTK_WINDOW(color_dialog), FALSE);
 	manage_window_set_transient(GTK_WINDOW(color_dialog));
 
-	g_signal_connect(G_OBJECT(GTK_COLOR_SELECTION_DIALOG(color_dialog)->cancel_button),
+	g_object_get(color_dialog, "ok-button", &button_ok,
+                               "cancel-button", &button_cancel,
+                               NULL);
+
+	g_signal_connect(G_OBJECT(&button_cancel),
 			 "clicked", G_CALLBACK(quote_colors_set_dialog_cancel), data);
-	g_signal_connect(G_OBJECT(GTK_COLOR_SELECTION_DIALOG(color_dialog)->ok_button),
+	g_signal_connect(G_OBJECT(&button_ok),
 			 "clicked", G_CALLBACK(quote_colors_set_dialog_ok), data);
 	g_signal_connect(G_OBJECT(color_dialog), "key_press_event",
 			 G_CALLBACK(quote_colors_set_dialog_key_pressed),data);
@@ -651,15 +657,16 @@
 
 	dialog = GTK_COLOR_SELECTION_DIALOG(color_dialog);
 	gtk_color_selection_set_current_color
-		(GTK_COLOR_SELECTION(dialog->colorsel), &color);
+		(GTK_COLOR_SELECTION(gtk_color_selection_dialog_get_color_selection(dialog)), &color);
 
 	gtk_widget_show(color_dialog);
 }
 
 static void quote_colors_set_dialog_ok(GtkWidget *widget, gpointer data)
 {
-	GtkColorSelection *colorsel = (GtkColorSelection *)
-						((GtkColorSelectionDialog *)color_dialog)->colorsel;
+	GtkColorSelection *colorsel = GTK_COLOR_SELECTION(
+		gtk_color_selection_dialog_get_color_selection
+						((GtkColorSelectionDialog *)color_dialog));
 	GdkColor color;
 	gint rgbvalue;
 	gchar *type = (gchar *)data;
@@ -727,23 +734,27 @@
 						GdkEventKey *event,
 						gpointer data)
 {
+	GtkColorSelectionDialog *dialog;
+	GtkWidget button_ok;
+	GtkWidget button_cancel;
+
+	dialog = GTK_COLOR_SELECTION_DIALOG(widget);
+	g_object_get(dialog, "ok-button", &button_ok,
+                         "cancel-button", &button_cancel,
+                          NULL);
+
 	if (event) {
 		switch (event->keyval) {
 			case GDK_Escape:
-				gtk_button_clicked(GTK_BUTTON(GTK_COLOR_SELECTION_DIALOG
-							(widget)->cancel_button));
+				gtk_button_clicked(GTK_BUTTON(&button_cancel));
 				return TRUE;
 			case GDK_Return: 
 			case GDK_KP_Enter:
 				/* NOTE: changing focus makes widget accept all currently 
 				 * changed settings! */
-				gtk_widget_grab_focus
-					(GTK_COLOR_SELECTION_DIALOG
-						(widget)->ok_button);
+				gtk_widget_grab_focus(&button_ok);
 				/* call ok handler */						
-				gtk_button_clicked(GTK_BUTTON
-					(GTK_COLOR_SELECTION_DIALOG
-						(widget)->ok_button));
+				gtk_button_clicked(GTK_BUTTON(&button_ok));
 				return TRUE;
 			default:
 				break;

Index: noticeview.c
===================================================================
RCS file: /home/claws-mail/claws/src/noticeview.c,v
retrieving revision 1.5.2.25
retrieving revision 1.5.2.26
diff -u -d -r1.5.2.25 -r1.5.2.26
--- noticeview.c	16 Feb 2011 07:16:11 -0000	1.5.2.25
+++ noticeview.c	7 Oct 2011 09:08:56 -0000	1.5.2.26
@@ -217,7 +217,7 @@
 				       NoticeView *noticeview)
 {
 	if (noticeview->icon_clickable)
-		gdk_window_set_cursor(noticeview->evtbox->window, hand_cursor);
+		gdk_window_set_cursor(gtk_widget_get_window(noticeview->evtbox), hand_cursor);
 	return FALSE;
 }
 
@@ -225,7 +225,7 @@
 				      GdkEventCrossing *event,
 				      NoticeView *noticeview)
 {
-	gdk_window_set_cursor(noticeview->evtbox->window, NULL);
+	gdk_window_set_cursor(gtk_widget_get_window(noticeview->evtbox), NULL);
 	return FALSE;
 }
 
@@ -234,7 +234,7 @@
 				      NoticeView *noticeview)
 {
 	if (noticeview->icon_clickable)
-		gdk_window_set_cursor(noticeview->evtbox->window, hand_cursor);
+		gdk_window_set_cursor(gtk_widget_get_window(noticeview->evtbox), hand_cursor);
 	return FALSE;
 }
 



More information about the Commits mailing list