GNOME.org
 

evolution-data-server r9932 - in trunk: . calendar calendar/backends/caldav libedataserverui servers/exchange servers/exchange/lib servers/google/libgdata-google

Author: mbarnes
Date: Wed Jan 14 20:20:25 2009
New Revision: 9932
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=9932&view=rev

Log:
2009-01-14  Matthew Barnes  <mbarnes redhat com>

	** Fixes bug #564543

	* configure.in:
	Bump gtk_minimum_version to 2.14.0.

	* libedataserverui/e-categories-dialog.c:
	* libedataserverui/e-cell-renderer-color.c:
	* libedataserverui/e-contact-store.h:
	* libedataserverui/e-destination-store.h:
	* libedataserverui/e-name-selector-dialog.c:
	* libedataserverui/e-name-selector-dialog.h:
	* libedataserverui/e-name-selector-entry.h:
	* libedataserverui/e-name-selector-list.c:
	* libedataserverui/e-passwords.c:
	* libedataserverui/e-source-option-menu.c:
	* libedataserverui/e-source-selector-dialog.c:
	* libedataserverui/e-tree-model-generator.c:
	* libedataserverui/e-tree-model-generator.h:
	Fix what we can with GSEAL_ENABLE defined.

	* calendar/backends/caldav/e-cal-backend-caldav.c (caldav_debug_setup):
	* servers/exchange/lib/e2k-context.c (e2k_context_set_auth):
	Call soup_session_add_feature() instead of soup_logger_attach().

	* servers/exchange/lib/e2k-context.c (e2k_context_fba):
	* servers/google/libgdata-google/gdata-google-service.c
	(gdata_google_service_authenticate):
	Call soup_form_encode_hash() instead of soup_form_encode_urlencoded().



Modified:
   trunk/ChangeLog
   trunk/calendar/ChangeLog
   trunk/calendar/backends/caldav/e-cal-backend-caldav.c
   trunk/configure.in
   trunk/libedataserverui/ChangeLog
   trunk/libedataserverui/e-categories-dialog.c
   trunk/libedataserverui/e-cell-renderer-color.c
   trunk/libedataserverui/e-contact-store.h
   trunk/libedataserverui/e-destination-store.h
   trunk/libedataserverui/e-name-selector-dialog.c
   trunk/libedataserverui/e-name-selector-dialog.h
   trunk/libedataserverui/e-name-selector-entry.h
   trunk/libedataserverui/e-name-selector-list.c
   trunk/libedataserverui/e-passwords.c
   trunk/libedataserverui/e-source-option-menu.c
   trunk/libedataserverui/e-source-selector-dialog.c
   trunk/libedataserverui/e-tree-model-generator.c
   trunk/libedataserverui/e-tree-model-generator.h
   trunk/servers/exchange/ChangeLog
   trunk/servers/exchange/lib/e2k-context.c
   trunk/servers/google/libgdata-google/ChangeLog
   trunk/servers/google/libgdata-google/gdata-google-service.c

Modified: trunk/calendar/backends/caldav/e-cal-backend-caldav.c
==============================================================================
--- trunk/calendar/backends/caldav/e-cal-backend-caldav.c	(original)
+++ trunk/calendar/backends/caldav/e-cal-backend-caldav.c	Wed Jan 14 20:20:25 2009
@@ -239,7 +239,7 @@
 		level = SOUP_LOGGER_LOG_MINIMAL;
 
 	logger = soup_logger_new (level, DEBUG_MAX_BODY_SIZE);
-	soup_logger_attach (logger, session);
+	soup_session_add_feature (session, SOUP_SESSION_FEATURE (logger));
 	g_object_unref (logger);
 }
 

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Wed Jan 14 20:20:25 2009
@@ -22,7 +22,7 @@
 
 # Required Package Versions
 m4_define([glib_minimum_version], [2.16.1])
-m4_define([gtk_minimum_version], [2.10.0])
+m4_define([gtk_minimum_version], [2.14.0])
 m4_define([ORBit_minimum_version], [2.9.8])
 m4_define([libbonobo_minimum_version], [2.20.3])
 m4_define([gconf_minimum_version], [2.0.0])             # XXX Just a Guess

Modified: trunk/libedataserverui/e-categories-dialog.c
==============================================================================
--- trunk/libedataserverui/e-categories-dialog.c	(original)
+++ trunk/libedataserverui/e-categories-dialog.c	Wed Jan 14 20:20:25 2009
@@ -472,6 +472,7 @@
 	GtkEntryCompletion *completion;
 	GtkTreeViewColumn *column;
 	GtkWidget *main_widget;
+	GtkWidget *content_area;
 	char *gladefile;
 
 	priv = g_new0 (ECategoriesDialogPrivate, 1);
@@ -490,8 +491,10 @@
 		return;
 	}
 
+	content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+
 	main_widget = glade_xml_get_widget (priv->gui, "table-categories");
-	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), main_widget, TRUE, TRUE, 0);
+	gtk_box_pack_start (GTK_BOX (content_area), main_widget, TRUE, TRUE, 0);
 
 	priv->categories_entry = glade_xml_get_widget (priv->gui, "entry-categories");
 	priv->categories_list = glade_xml_get_widget (priv->gui, "categories-list");

Modified: trunk/libedataserverui/e-cell-renderer-color.c
==============================================================================
--- trunk/libedataserverui/e-cell-renderer-color.c	(original)
+++ trunk/libedataserverui/e-cell-renderer-color.c	Wed Jan 14 20:20:25 2009
@@ -57,20 +57,28 @@
 	gint color_height = 16;
 	gint calc_width;
 	gint calc_height;
+	gfloat xalign;
+	gfloat yalign;
+	guint xpad;
+	guint ypad;
+
+	g_object_get (
+		cell, "xalign", &xalign, "yalign", &yalign,
+		"xpad", &xpad, "ypad", &ypad, NULL);
 
-	calc_width  = (gint) cell->xpad * 2 + color_width;
-	calc_height = (gint) cell->ypad * 2 + color_height;
+	calc_width  = (gint) xpad * 2 + color_width;
+	calc_height = (gint) ypad * 2 + color_height;
 
 	if (cell_area && color_width > 0 && color_height > 0) {
 		if (x_offset) {
 			*x_offset = (((gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) ?
-					(1.0 - cell->xalign) : cell->xalign) *
+					(1.0 - xalign) : xalign) *
 					(cell_area->width - calc_width));
 			*x_offset = MAX (*x_offset, 0);
 		}
 
 		if (y_offset) {
-			*y_offset = (cell->yalign *
+			*y_offset =(yalign *
 				(cell_area->height - calc_height));
 			*y_offset = MAX (*y_offset, 0);
 		}
@@ -99,6 +107,8 @@
 	GdkRectangle pix_rect;
 	GdkRectangle draw_rect;
 	GdkGC *gc;
+	guint xpad;
+	guint ypad;
 
 	priv = E_CELL_RENDERER_COLOR_GET_PRIVATE (cell);
 
@@ -110,10 +120,12 @@
 		&pix_rect.x, &pix_rect.y,
 		&pix_rect.width, &pix_rect.height);
 
-	pix_rect.x += cell_area->x + cell->xpad;
-	pix_rect.y += cell_area->y + cell->ypad;
-	pix_rect.width  -= cell->xpad * 2;
-	pix_rect.height -= cell->ypad * 2;
+	g_object_get (cell, "xpad", &xpad, "ypad", &ypad, NULL);
+
+	pix_rect.x += cell_area->x + xpad;
+	pix_rect.y += cell_area->y + ypad;
+	pix_rect.width  -= xpad * 2;
+	pix_rect.height -= ypad * 2;
 
 	if (!gdk_rectangle_intersect (cell_area, &pix_rect, &draw_rect) ||
 	    !gdk_rectangle_intersect (expose_area, &draw_rect, &draw_rect))
@@ -218,7 +230,7 @@
 {
 	cellcolor->priv = E_CELL_RENDERER_COLOR_GET_PRIVATE (cellcolor);
 
-	GTK_CELL_RENDERER (cellcolor)->xpad = 4;
+	g_object_set (cellcolor, "xpad", 4, NULL);
 }
 
 GtkCellRenderer *

Modified: trunk/libedataserverui/e-contact-store.h
==============================================================================
--- trunk/libedataserverui/e-contact-store.h	(original)
+++ trunk/libedataserverui/e-contact-store.h	Wed Jan 14 20:20:25 2009
@@ -29,14 +29,26 @@
 #include <libebook/e-book-query.h>
 #include <libebook/e-book-types.h>
 
-G_BEGIN_DECLS
+/* Standard GObject macros */
+#define E_TYPE_CONTACT_STORE \
+	(e_contact_store_get_type ())
+#define E_CONTACT_STORE(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_CONTACT_STORE, EContactStore))
+#define E_CONTACT_STORE_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_CONTACT_STORE, EContactStoreClass))
+#define E_IS_CONTACT_STORE(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_CONTACT_STORE))
+#define E_IS_CONTACT_STORE_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_CONTACT_STORE))
+#define E_CONTACT_STORE_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_CONTACT_STORE, EContactStoreClass))
 
-#define E_TYPE_CONTACT_STORE            (e_contact_store_get_type ())
-#define E_CONTACT_STORE(obj)	        (GTK_CHECK_CAST ((obj), E_TYPE_CONTACT_STORE, EContactStore))
-#define E_CONTACT_STORE_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_CONTACT_STORE, EContactStoreClass))
-#define E_IS_CONTACT_STORE(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_CONTACT_STORE))
-#define E_IS_CONTACT_STORE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_CONTACT_STORE))
-#define E_CONTACT_STORE_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), E_TYPE_CONTACT_STORE, EContactStoreClass))
+G_BEGIN_DECLS
 
 typedef struct _EContactStore       EContactStore;
 typedef struct _EContactStoreClass  EContactStoreClass;
@@ -55,7 +67,7 @@
 	GArray     *contact_sources;
 };
 
-GtkType        e_contact_store_get_type     (void);
+GType          e_contact_store_get_type     (void);
 EContactStore *e_contact_store_new          (void);
 
 EBook         *e_contact_store_get_book     (EContactStore *contact_store, GtkTreeIter *iter);

Modified: trunk/libedataserverui/e-destination-store.h
==============================================================================
--- trunk/libedataserverui/e-destination-store.h	(original)
+++ trunk/libedataserverui/e-destination-store.h	Wed Jan 14 20:20:25 2009
@@ -26,14 +26,26 @@
 #include <gtk/gtk.h>
 #include <libebook/e-destination.h>
 
-G_BEGIN_DECLS
+/* Standard GObject macros */
+#define E_TYPE_DESTINATION_STORE \
+	(e_destination_store_get_type ())
+#define E_DESTINATION_STORE(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_DESTINATION_STORE, EDestinationStore))
+#define E_DESTINATION_STORE_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_DESTINATION_STORE, EDestinationStoreClass))
+#define E_IS_DESTINATION_STORE(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_DESTINATION_STORE))
+#define E_IS_DESTINATION_STORE_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_DESTINATION_STORE))
+#define E_DESTINATION_STORE_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_DESTINATION_STORE, EDestinationStoreClass))
 
-#define E_TYPE_DESTINATION_STORE            (e_destination_store_get_type ())
-#define E_DESTINATION_STORE(obj)	    (GTK_CHECK_CAST ((obj), E_TYPE_DESTINATION_STORE, EDestinationStore))
-#define E_DESTINATION_STORE_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_DESTINATION_STORE, EDestinationStoreClass))
-#define E_IS_DESTINATION_STORE(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_DESTINATION_STORE))
-#define E_IS_DESTINATION_STORE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_DESTINATION_STORE))
-#define E_DESTINATION_STORE_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), E_TYPE_DESTINATION_STORE, EDestinationStoreClass))
+G_BEGIN_DECLS
 
 typedef struct _EDestinationStore       EDestinationStore;
 typedef struct _EDestinationStoreClass  EDestinationStoreClass;
@@ -61,7 +73,7 @@
 }
 EDestinationStoreColumnType;
 
-GtkType            e_destination_store_get_type           (void);
+GType              e_destination_store_get_type           (void);
 EDestinationStore *e_destination_store_new                (void);
 
 EDestination      *e_destination_store_get_destination    (EDestinationStore *destination_store,

Modified: trunk/libedataserverui/e-name-selector-dialog.c
==============================================================================
--- trunk/libedataserverui/e-name-selector-dialog.c	(original)
+++ trunk/libedataserverui/e-name-selector-dialog.c	Wed Jan 14 20:20:25 2009
@@ -132,7 +132,9 @@
 	GtkCellRenderer   *cell_renderer;
 	GtkWidget         *widget;
 	GtkWidget         *container;
+	GtkWidget         *content_area;
 	GtkWidget	  *label;
+	GtkWidget         *parent;
 	GtkTreeSelection  *selection;
 	ESourceList       *source_list;
 	char              *gladefile;
@@ -168,9 +170,13 @@
 
 	/* Reparent it to inside ourselves */
 
+	content_area = gtk_dialog_get_content_area (
+		GTK_DIALOG (name_selector_dialog));
+
 	g_object_ref (widget);
-	gtk_container_remove (GTK_CONTAINER (widget->parent), widget);
-	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (name_selector_dialog)->vbox), widget, TRUE, TRUE, 0);
+	parent = gtk_widget_get_parent (widget);
+	gtk_container_remove (GTK_CONTAINER (parent), widget);
+	gtk_box_pack_start (GTK_BOX (content_area), widget, TRUE, TRUE, 0);
 	g_object_unref (widget);
 
 	/* Store pointers to relevant widgets */

Modified: trunk/libedataserverui/e-name-selector-dialog.h
==============================================================================
--- trunk/libedataserverui/e-name-selector-dialog.h	(original)
+++ trunk/libedataserverui/e-name-selector-dialog.h	Wed Jan 14 20:20:25 2009
@@ -30,14 +30,26 @@
 #include <libedataserverui/e-contact-store.h>
 #include <libedataserverui/e-name-selector-model.h>
 
-G_BEGIN_DECLS
+/* Standard GObject macros */
+#define E_TYPE_NAME_SELECTOR_DIALOG \
+	(e_name_selector_dialog_get_type ())
+#define E_NAME_SELECTOR_DIALOG(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_NAME_SELECTOR_DIALOG, ENameSelectorDialog))
+#define E_NAME_SELECTOR_DIALOG_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_NAME_SELECTOR_DIALOG, ENameSelectorDialogClass))
+#define E_IS_NAME_SELECTOR_DIALOG(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	(obj, E_TYPE_NAME_SELECTOR_DIALOG))
+#define E_IS_NAME_SELECTOR_DIALOG_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_NAME_SELECTOR_DIALOG))
+#define E_NAME_SELECTOR_DIALOG_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_NAME_SELECTOR_DIALOG, ENameSelectorDialogClass))
 
-#define E_TYPE_NAME_SELECTOR_DIALOG            (e_name_selector_dialog_get_type ())
-#define E_NAME_SELECTOR_DIALOG(obj)            (GTK_CHECK_CAST ((obj), e_name_selector_dialog_get_type (), ENameSelectorDialog))
-#define E_NAME_SELECTOR_DIALOG_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), e_name_selector_dialog_get_type (), ENameSelectorDialogClass))
-#define E_IS_NAME_SELECTOR_DIALOG(obj)         (GTK_CHECK_TYPE (obj, e_name_selector_dialog_get_type ()))
-#define E_IS_NAME_SELECTOR_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), e_name_selector_dialog_get_type ()))
-#define E_NAME_SELECTOR_DIALOG_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), E_NAME_SELECTOR_DIALOG_TYPE, ENameSelectorDialogClass))
+G_BEGIN_DECLS
 
 typedef struct _ENameSelectorDialog      ENameSelectorDialog;
 typedef struct _ENameSelectorDialogClass ENameSelectorDialogClass;

Modified: trunk/libedataserverui/e-name-selector-entry.h
==============================================================================
--- trunk/libedataserverui/e-name-selector-entry.h	(original)
+++ trunk/libedataserverui/e-name-selector-entry.h	Wed Jan 14 20:20:25 2009
@@ -30,19 +30,31 @@
 #include <libedataserverui/e-destination-store.h>
 #include <libedataserverui/e-tree-model-generator.h>
 
-G_BEGIN_DECLS
-
-#define E_TYPE_NAME_SELECTOR_ENTRY            (e_name_selector_entry_get_type ())
-#define E_NAME_SELECTOR_ENTRY(obj)            (GTK_CHECK_CAST ((obj), e_name_selector_entry_get_type (), ENameSelectorEntry))
-#define E_NAME_SELECTOR_ENTRY_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), e_name_selector_entry_get_type (), ENameSelectorEntryClass))
-#define E_IS_NAME_SELECTOR_ENTRY(obj)         (GTK_CHECK_TYPE (obj, e_name_selector_entry_get_type ()))
-#define E_IS_NAME_SELECTOR_ENTRY_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), e_name_selector_entry_get_type ()))
-#define E_NAME_SELECTOR_ENTRY_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), E_NAME_SELECTOR_ENTRY_TYPE, ENameSelectorEntryClass))
+/* Standard GObject macros */
+#define E_TYPE_NAME_SELECTOR_ENTRY \
+	(e_name_selector_entry_get_type ())
+#define E_NAME_SELECTOR_ENTRY(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_NAME_SELECTOR_ENTRY, ENameSelectorEntry))
+#define E_NAME_SELECTOR_ENTRY_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_NAME_SELECTOR_ENTRY, ENameSelectorEntryClass))
+#define E_IS_NAME_SELECTOR_ENTRY(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_NAME_SELECTOR_ENTRY))
+#define E_IS_NAME_SELECTOR_ENTRY_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_NAME_SELECTOR_ENTRY))
+#define E_NAME_SELECTOR_ENTRY_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_NAME_SELECTOR_ENTRY, ENameSelectorEntryClass))
 
 #define MINIMUM_QUERY_LENGTH "/apps/evolution/addressbook/completion/minimum_query_length"
 #define FORCE_SHOW_ADDRESS   "/apps/evolution/addressbook/completion/show_address"
 #define USER_QUERY_FIELDS "/apps/evolution/addressbook/completion/user_query_fields"
 
+G_BEGIN_DECLS
+
 typedef struct _ENameSelectorEntry      ENameSelectorEntry;
 typedef struct _ENameSelectorEntryClass ENameSelectorEntryClass;
 

Modified: trunk/libedataserverui/e-name-selector-list.c
==============================================================================
--- trunk/libedataserverui/e-name-selector-list.c	(original)
+++ trunk/libedataserverui/e-name-selector-list.c	Wed Jan 14 20:20:25 2009
@@ -71,10 +71,12 @@
 static void
 enl_popup_position (ENameSelectorList *list)
 {
+	GdkWindow *window;
 	int x,y;
 
 	enl_popup_size (list);
-	gdk_window_get_origin (((GtkWidget *)list)->window, &x, &y);
+	window = gtk_widget_get_window (GTK_WIDGET (list));
+	gdk_window_get_origin (window, &x, &y);
 	y = y +((GtkWidget *)list)->allocation.height;
 
 	gtk_window_move (list->popup, x, y);
@@ -83,17 +85,20 @@
 static void
 enl_popup_grab (ENameSelectorList *list)
 {
+	GdkWindow *window;
 	int len;
 
+	window = gtk_widget_get_window (GTK_WIDGET (list->popup));
+
 	gtk_grab_add (GTK_WIDGET (list->popup));
 
-	gdk_pointer_grab (((GtkWidget *)list->popup)->window, TRUE,
+	gdk_pointer_grab (window, TRUE,
                     	  GDK_BUTTON_PRESS_MASK |
                     	  GDK_BUTTON_RELEASE_MASK |
                     	  GDK_POINTER_MOTION_MASK,
                 	  NULL, NULL, GDK_CURRENT_TIME);
 
-    	gdk_keyboard_grab (((GtkWidget *)list->popup)->window, TRUE, GDK_CURRENT_TIME);
+    	gdk_keyboard_grab (window, TRUE, GDK_CURRENT_TIME);
 	gtk_widget_grab_focus ((GtkWidget *)list);
 
 	/* Build the listview from the model */
@@ -610,7 +615,9 @@
 					GTK_POLICY_AUTOMATIC);
 	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scroll),
                                        	     GTK_SHADOW_NONE);
-	gtk_widget_set_size_request (GTK_SCROLLED_WINDOW (scroll)->vscrollbar, -1, 0);
+	gtk_widget_set_size_request (
+		gtk_scrolled_window_get_vscrollbar (
+		GTK_SCROLLED_WINDOW (scroll)), -1, 0);
 
 	list->popup =  GTK_WINDOW (gtk_window_new (GTK_WINDOW_POPUP));
  	gtk_window_set_resizable (GTK_WINDOW (list->popup), FALSE);

Modified: trunk/libedataserverui/e-passwords.c
==============================================================================
--- trunk/libedataserverui/e-passwords.c	(original)
+++ trunk/libedataserverui/e-passwords.c	Wed Jan 14 20:20:25 2009
@@ -1103,6 +1103,8 @@
 {
 	GtkWidget *widget;
 	GtkWidget *container;
+	GtkWidget *action_area;
+	GtkWidget *content_area;
 	gint type = msg->flags & E_PASSWORDS_REMEMBER_MASK;
 	guint noreply = msg->noreply;
 	gboolean visible;
@@ -1124,13 +1126,14 @@
 	gtk_container_set_border_width (GTK_CONTAINER (widget), 12);
 	password_dialog = GTK_DIALOG (widget);
 
+	action_area = gtk_dialog_get_action_area (password_dialog);
+	content_area = gtk_dialog_get_content_area (password_dialog);
+
 	/* Override GtkDialog defaults */
-	widget = password_dialog->vbox;
-	gtk_box_set_spacing (GTK_BOX (widget), 12);
-	gtk_container_set_border_width (GTK_CONTAINER (widget), 0);
-	widget = password_dialog->action_area;
-	gtk_box_set_spacing (GTK_BOX (widget), 12);
-	gtk_container_set_border_width (GTK_CONTAINER (widget), 0);
+	gtk_box_set_spacing (GTK_BOX (action_area), 12);
+	gtk_container_set_border_width (GTK_CONTAINER (action_area), 0);
+	gtk_box_set_spacing (GTK_BOX (content_area), 12);
+	gtk_container_set_border_width (GTK_CONTAINER (content_area), 0);
 
 	/* Table */
 	container = gtk_table_new (2, 3, FALSE);
@@ -1141,8 +1144,7 @@
 	gtk_widget_show (container);
 
 	gtk_box_pack_start (
-		GTK_BOX (password_dialog->vbox),
-		container, FALSE, TRUE, 0);
+		GTK_BOX (content_area), container, FALSE, TRUE, 0);
 
 	/* Password Image */
 	widget = gtk_image_new_from_icon_name (

Modified: trunk/libedataserverui/e-source-option-menu.c
==============================================================================
--- trunk/libedataserverui/e-source-option-menu.c	(original)
+++ trunk/libedataserverui/e-source-option-menu.c	Wed Jan 14 20:20:25 2009
@@ -126,7 +126,7 @@
 
 		gtk_widget_set_sensitive (item1, FALSE);
 		gtk_widget_show (item1);
-		gtk_menu_append (GTK_MENU (menu), item1);
+		gtk_menu_shell_append (GTK_MENU_SHELL (menu), item1);
 
 		i ++;
 

Modified: trunk/libedataserverui/e-source-selector-dialog.c
==============================================================================
--- trunk/libedataserverui/e-source-selector-dialog.c	(original)
+++ trunk/libedataserverui/e-source-selector-dialog.c	Wed Jan 14 20:20:25 2009
@@ -86,18 +86,23 @@
 e_source_selector_dialog_init (ESourceSelectorDialog *dialog)
 {
 	ESourceSelectorDialogPrivate *priv;
+	GtkWidget *action_area;
+	GtkWidget *content_area;
 
 	priv = g_new0 (ESourceSelectorDialogPrivate, 1);
 	priv->selected_source = NULL;
 	dialog->priv = priv;
 
+	action_area = gtk_dialog_get_action_area (GTK_DIALOG (dialog));
+	content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+
 	/* prepare the dialog */
 	gtk_window_set_title (GTK_WINDOW (dialog), _("Select destination"));
 	gtk_window_set_default_size (GTK_WINDOW (dialog), 320, 240);
 	gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
 	gtk_widget_ensure_style (GTK_WIDGET (dialog));
-	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), 0);
-	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->action_area), 12);
+	gtk_container_set_border_width (GTK_CONTAINER (content_area), 0);
+	gtk_container_set_border_width (GTK_CONTAINER (action_area), 12);
 	gtk_dialog_add_buttons (GTK_DIALOG (dialog),
 				GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 				GTK_STOCK_OK, GTK_RESPONSE_OK,
@@ -135,14 +140,17 @@
 setup_dialog (GtkWindow *parent, ESourceSelectorDialog *dialog, ESourceList *source_list)
 {
 	GtkWidget *vbox, *label, *scroll, *hbox, *spacer;
+	GtkWidget *content_area;
 	char *label_text;
 	ESourceSelectorDialogPrivate *priv = dialog->priv;
 
 	priv->source_list = g_object_ref (source_list);
 
+	content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+
 	vbox = gtk_vbox_new (FALSE, 12);
 	gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
-	gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), vbox);
+	gtk_container_add (GTK_CONTAINER (content_area), vbox);
 	gtk_widget_show (vbox);
 
 	label_text = g_strdup_printf ("<b>%s</b>", _("_Destination"));

Modified: trunk/libedataserverui/e-tree-model-generator.c
==============================================================================
--- trunk/libedataserverui/e-tree-model-generator.c	(original)
+++ trunk/libedataserverui/e-tree-model-generator.c	Wed Jan 14 20:20:25 2009
@@ -770,7 +770,7 @@
 void
 e_tree_model_generator_set_generate_func (ETreeModelGenerator *tree_model_generator,
 					  ETreeModelGeneratorGenerateFunc func,
-					  gpointer data, GtkDestroyNotify destroy)
+					  gpointer data, GDestroyNotify destroy)
 {
 	g_return_if_fail (E_IS_TREE_MODEL_GENERATOR (tree_model_generator));
 
@@ -793,7 +793,7 @@
 void
 e_tree_model_generator_set_modify_func (ETreeModelGenerator *tree_model_generator,
 					ETreeModelGeneratorModifyFunc func,
-					gpointer data, GtkDestroyNotify destroy)
+					gpointer data, GDestroyNotify destroy)
 {
 	g_return_if_fail (E_IS_TREE_MODEL_GENERATOR (tree_model_generator));
 

Modified: trunk/libedataserverui/e-tree-model-generator.h
==============================================================================
--- trunk/libedataserverui/e-tree-model-generator.h	(original)
+++ trunk/libedataserverui/e-tree-model-generator.h	Wed Jan 14 20:20:25 2009
@@ -25,14 +25,26 @@
 
 #include <gtk/gtk.h>
 
-G_BEGIN_DECLS
+/* Standard GObject macros */
+#define E_TYPE_TREE_MODEL_GENERATOR \
+	(e_tree_model_generator_get_type ())
+#define E_TREE_MODEL_GENERATOR(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_TREE_MODEL_GENERATOR, ETreeModelGenerator))
+#define E_TREE_MODEL_GENERATOR_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_TREE_MODEL_GENERATOR, ETreeModelGeneratorClass))
+#define E_IS_TREE_MODEL_GENERATOR(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_TREE_MODEL_GENERATOR))
+#define E_IS_TREE_MODEL_GENERATOR_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_TREE_MODEL_GENERATOR))
+#define E_TREE_MODEL_GENERATOR_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_TREE_MODEL_GENERATOR, ETreeModelGeneratorClass))
 
-#define E_TYPE_TREE_MODEL_GENERATOR            (e_tree_model_generator_get_type ())
-#define E_TREE_MODEL_GENERATOR(obj)	       (GTK_CHECK_CAST ((obj), E_TYPE_TREE_MODEL_GENERATOR, ETreeModelGenerator))
-#define E_TREE_MODEL_GENERATOR_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_TREE_MODEL_GENERATOR, ETreeModelGeneratorClass))
-#define E_IS_TREE_MODEL_GENERATOR(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_TREE_MODEL_GENERATOR))
-#define E_IS_TREE_MODEL_GENERATOR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_TREE_MODEL_GENERATOR))
-#define E_TREE_MODEL_GENERATOR_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), E_TYPE_TREE_MODEL_GENERATOR, ETreeModelGeneratorClass))
+G_BEGIN_DECLS
 
 typedef gint (*ETreeModelGeneratorGenerateFunc) (GtkTreeModel *model, GtkTreeIter *child_iter,
 						 gpointer data);
@@ -63,17 +75,17 @@
 	gpointer                         modify_func_data;
 };
 
-GtkType              e_tree_model_generator_get_type                   (void);
+GType                e_tree_model_generator_get_type                   (void);
 
 ETreeModelGenerator *e_tree_model_generator_new                        (GtkTreeModel *child_model);
 GtkTreeModel        *e_tree_model_generator_get_model                  (ETreeModelGenerator *tree_model_generator);
 
 void                 e_tree_model_generator_set_generate_func          (ETreeModelGenerator *tree_model_generator,
 									ETreeModelGeneratorGenerateFunc func,
-									gpointer data, GtkDestroyNotify destroy);
+									gpointer data, GDestroyNotify destroy);
 void                 e_tree_model_generator_set_modify_func            (ETreeModelGenerator *tree_model_generator,
 									ETreeModelGeneratorModifyFunc func,
-									gpointer data, GtkDestroyNotify destroy);
+									gpointer data, GDestroyNotify destroy);
 
 GtkTreePath         *e_tree_model_generator_convert_child_path_to_path (ETreeModelGenerator *tree_model_generator,
 									GtkTreePath *child_path);

Modified: trunk/servers/exchange/lib/e2k-context.c
==============================================================================
--- trunk/servers/exchange/lib/e2k-context.c	(original)
+++ trunk/servers/exchange/lib/e2k-context.c	Wed Jan 14 20:20:25 2009
@@ -466,8 +466,10 @@
 		soup_logger_set_request_filter (logger, e2k_debug_request_filter, NULL, NULL);
 		soup_logger_set_response_filter (logger, e2k_debug_response_filter, NULL, NULL);
 	}
-	soup_logger_attach (logger, ctx->priv->session);
-	soup_logger_attach (logger, ctx->priv->async_session);
+	soup_session_add_feature (
+		ctx->priv->session, SOUP_SESSION_FEATURE (logger));
+	soup_session_add_feature (
+		ctx->priv->async_session, SOUP_SESSION_FEATURE (logger));
 #endif
 }
 
@@ -673,7 +675,7 @@
 	xmlFreeDoc (doc);
 	doc = NULL;
 
-	form_body = soup_form_encode_urlencoded (form_data);
+	form_body = soup_form_encode_hash (form_data);
 	g_hash_table_destroy (form_data);
 
 	post_msg = e2k_soup_message_new_full (ctx, action, "POST",

Modified: trunk/servers/google/libgdata-google/gdata-google-service.c
==============================================================================
--- trunk/servers/google/libgdata-google/gdata-google-service.c	(original)
+++ trunk/servers/google/libgdata-google/gdata-google-service.c	Wed Jan 14 20:20:25 2009
@@ -689,7 +689,7 @@
 	g_hash_table_insert (request_form, "service", priv->name);
 	g_hash_table_insert (request_form, "source", priv->agent);
 	g_hash_table_insert (request_form, "accountType", "HOSTED_OR_GOOGLE");
-	request_body = soup_form_encode_urlencoded (request_form);
+	request_body = soup_form_encode_hash (request_form);
 	g_hash_table_destroy (request_form);
 
 	msg = soup_message_new(SOUP_METHOD_POST, GOOGLE_CLIENT_LOGIN);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]