Replace EBinding with GBinding.

GObject now does property bindings itself.

Requires GLib >= 2.26.

9 files changed, 82 insertions, 52 deletions

diff --git a/mail/e-mail-attachment-bar.c b/mail/e-mail-attachment-bar.c
index c5ce9cf7bf..0de674149b 100644
--- a/mail/e-mail-attachment-bar.c
+++ b/mail/e-mail-attachment-bar.c
@@ -23,7 +23,6 @@
 
 #include <glib/gi18n.h>
 
-#include "e-util/e-binding.h"
 #include "e-util/gconf-bridge.h"
 
 #include "e-attachment-store.h"
@@ -266,37 +265,53 @@ mail_attachment_bar_constructed (GObject *object)
 
 	/* Set up property-to-property bindings. */
 
-	e_mutual_binding_new (
+	g_object_bind_property (
 		object, "active-view",
-		priv->combo_box, "active");
+		priv->combo_box, "active",
+		G_BINDING_BIDIRECTIONAL |
+		G_BINDING_SYNC_CREATE);
 
-	e_mutual_binding_new (
+	g_object_bind_property (
 		object, "dragging",
-		priv->icon_view, "dragging");
+		priv->icon_view, "dragging",
+		G_BINDING_BIDIRECTIONAL |
+		G_BINDING_SYNC_CREATE);
 
-	e_mutual_binding_new (
+	g_object_bind_property (
 		object, "dragging",
-		priv->tree_view, "dragging");
+		priv->tree_view, "dragging",
+		G_BINDING_BIDIRECTIONAL |
+		G_BINDING_SYNC_CREATE);
 
-	e_mutual_binding_new (
+	g_object_bind_property (
 		object, "editable",
-		priv->icon_view, "editable");
+		priv->icon_view, "editable",
+		G_BINDING_BIDIRECTIONAL |
+		G_BINDING_SYNC_CREATE);
 
-	e_mutual_binding_new (
+	g_object_bind_property (
 		object, "editable",
-		priv->tree_view, "editable");
+		priv->tree_view, "editable",
+		G_BINDING_BIDIRECTIONAL |
+		G_BINDING_SYNC_CREATE);
 
-	e_mutual_binding_new (
+	g_object_bind_property (
 		object, "expanded",
-		priv->expander, "expanded");
+		priv->expander, "expanded",
+		G_BINDING_BIDIRECTIONAL |
+		G_BINDING_SYNC_CREATE);
 
-	e_mutual_binding_new (
+	g_object_bind_property (
 		object, "expanded",
-		priv->combo_box, "visible");
+		priv->combo_box, "visible",
+		G_BINDING_BIDIRECTIONAL |
+		G_BINDING_SYNC_CREATE);
 
-	e_mutual_binding_new (
+	g_object_bind_property (
 		object, "expanded",
-		priv->vbox, "visible");
+		priv->vbox, "visible",
+		G_BINDING_BIDIRECTIONAL |
+		G_BINDING_SYNC_CREATE);
 
 	/* Set up property-to-GConf bindings. */
 
diff --git a/mail/e-mail-backend.c b/mail/e-mail-backend.c
index c9c668d101..dd34737272 100644
--- a/mail/e-mail-backend.c
+++ b/mail/e-mail-backend.c
@@ -29,7 +29,6 @@
 
 #include "e-util/e-account-utils.h"
 #include "e-util/e-alert-dialog.h"
-#include "e-util/e-binding.h"
 
 #include "misc/e-account-combo-box.h"
 
@@ -465,7 +464,10 @@ mail_backend_constructed (GObject *object)
 
 	priv->session = e_mail_session_new ();
 
-	e_binding_new (shell, "online", priv->session, "online");
+	g_object_bind_property (
+		shell, "online",
+		priv->session, "online",
+		G_BINDING_SYNC_CREATE);
 
 	/* FIXME This is an evil hack that needs to die.
 	 *       Give EAccountComboBox a CamelSession property. */
diff --git a/mail/e-mail-label-action.c b/mail/e-mail-label-action.c
index 315ee10e26..b7487fc047 100644
--- a/mail/e-mail-label-action.c
+++ b/mail/e-mail-label-action.c
@@ -21,8 +21,6 @@
 
 #include "e-mail-label-action.h"
 
-#include "e-util/e-binding.h"
-
 #define E_MAIL_LABEL_ACTION_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
 	((obj), E_TYPE_MAIL_LABEL_ACTION, EMailLabelActionPrivate))
@@ -62,22 +60,21 @@ mail_label_action_menu_item_realize_cb (GtkWidget *menu_item)
 
 	container = widget;
 
-	/*stock_id = gtk_action_get_stock_id (action);
-	widget = gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_MENU);*/
 	widget = gtk_action_create_icon (action, GTK_ICON_SIZE_MENU);
 	gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
 	gtk_widget_show (widget);
 
-	/* XXX GtkImage calls it "stock", not "stock-id". */
-	/*e_mutual_binding_new (action, "stock-id", widget, "stock");*/
-
 	widget = gtk_label_new (NULL);
 	gtk_label_set_use_underline (GTK_LABEL (widget), TRUE);
 	gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.5);
 	gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0);
 	gtk_widget_show (widget);
 
-	e_mutual_binding_new (action, "label", widget, "label");
+	g_object_bind_property (
+		action, "label",
+		widget, "label",
+		G_BINDING_BIDIRECTIONAL |
+		G_BINDING_SYNC_CREATE);
 }
 
 static GtkWidget *
diff --git a/mail/e-mail-paned-view.c b/mail/e-mail-paned-view.c
index 9782a8de6a..236c7cb782 100644
--- a/mail/e-mail-paned-view.c
+++ b/mail/e-mail-paned-view.c
@@ -31,7 +31,6 @@
 #include <libedataserver/e-data-server-util.h>
 
 #include "e-util/e-util-private.h"
-#include "e-util/e-binding.h"
 #include "e-util/gconf-bridge.h"
 #include "widgets/menus/gal-view-etable.h"
 #include "widgets/menus/gal-view-instance.h"
@@ -568,7 +567,10 @@ mail_paned_view_constructed (GObject *object)
 	priv->paned = g_object_ref (widget);
 	gtk_widget_show (widget);
 
-	e_binding_new (object, "orientation", widget, "orientation");
+	g_object_bind_property (
+		object, "orientation",
+		widget, "orientation",
+		G_BINDING_SYNC_CREATE);
 
 	container = priv->paned;
 
@@ -598,7 +600,10 @@ mail_paned_view_constructed (GObject *object)
 	gtk_paned_pack2 (GTK_PANED (container), widget, FALSE, FALSE);
 	gtk_widget_show (widget);
 
-	e_binding_new (object, "preview-visible", widget, "visible");
+	g_object_bind_property (
+		object, "preview-visible",
+		widget, "visible",
+		G_BINDING_SYNC_CREATE);
 
 	search_bar = e_preview_pane_get_search_bar (E_PREVIEW_PANE (widget));
 	priv->search_bar = g_object_ref (search_bar);
diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c
index 184cc757df..83dc3f569a 100644
--- a/mail/e-mail-reader.c
+++ b/mail/e-mail-reader.c
@@ -29,7 +29,6 @@
 #endif
 
 #include "e-util/e-account-utils.h"
-#include "e-util/e-binding.h"
 #include "e-util/e-charset.h"
 #include "e-util/e-util.h"
 #include "e-util/e-alert-dialog.h"
@@ -3317,9 +3316,11 @@ e_mail_reader_init (EMailReader *reader,
 	action_name = "mail-caret-mode";
 	action = e_mail_reader_get_action (reader, action_name);
 
-	e_mutual_binding_new (
+	g_object_bind_property (
 		action, "active",
-		web_view, "caret-mode");
+		web_view, "caret-mode",
+		G_BINDING_BIDIRECTIONAL |
+		G_BINDING_SYNC_CREATE);
 
 connect_signals:
 
diff --git a/mail/e-mail-tag-editor.c b/mail/e-mail-tag-editor.c
index 004cba7049..ab7fdd22c4 100644
--- a/mail/e-mail-tag-editor.c
+++ b/mail/e-mail-tag-editor.c
@@ -31,7 +31,6 @@
 #include <glib/gi18n-lib.h>
 
 #include "e-util/e-util.h"
-#include "e-util/e-binding.h"
 #include "widgets/misc/e-dateedit.h"
 
 #define E_MAIL_TAG_EDITOR_GET_PRIVATE(obj) \
@@ -309,7 +308,10 @@ mail_tag_editor_init (EMailTagEditor *editor)
 	gtk_box_pack_start (GTK_BOX (content_area), widget, TRUE, TRUE, 6);
 
 	widget = e_builder_get_widget (builder, "pixmap");
-	e_binding_new (window, "icon-name", widget, "icon-name");
+	g_object_bind_property (
+		window, "icon-name",
+		widget, "icon-name",
+		G_BINDING_SYNC_CREATE);
 
 	widget = e_builder_get_widget (builder, "message_list");
 	editor->priv->message_list = GTK_TREE_VIEW (widget);
@@ -335,15 +337,21 @@ mail_tag_editor_init (EMailTagEditor *editor)
 
 	widget = e_builder_get_widget (builder, "target_date");
 	editor->priv->target_date = E_DATE_EDIT (widget);
-	e_binding_new (
+	g_object_bind_property (
 		editor, "use-24-hour-format",
-		widget, "use-24-hour-format");
-	e_binding_new (
+		widget, "use-24-hour-format",
+		G_BINDING_SYNC_CREATE);
+	g_object_bind_property (
 		editor, "week-start-day",
-		widget, "week-start-day");
+		widget, "week-start-day",
+		G_BINDING_SYNC_CREATE);
 
 	widget = e_builder_get_widget (builder, "completed");
-	e_mutual_binding_new (editor, "completed", widget, "active");
+	g_object_bind_property (
+		editor, "completed",
+		widget, "active",
+		G_BINDING_BIDIRECTIONAL |
+		G_BINDING_SYNC_CREATE);
 
 	widget = e_builder_get_widget (builder, "clear");
 	g_signal_connect_swapped (
diff --git a/mail/em-folder-properties.c b/mail/em-folder-properties.c
index c0e9ad9537..525a7ffefa 100644
--- a/mail/em-folder-properties.c
+++ b/mail/em-folder-properties.c
@@ -31,8 +31,6 @@
 
 #include <gconf/gconf-client.h>
 
-#include <e-util/e-binding.h>
-
 #include "em-folder-properties.h"
 #include "em-config.h"
 
@@ -172,10 +170,12 @@ emfp_get_folder_item (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidg
 		switch (properties[ii]->value_type) {
 			case G_TYPE_BOOLEAN:
 				widget = gtk_check_button_new_with_label (blurb);
-				e_mutual_binding_new (
+				g_object_bind_property (
 					prop_data->object,
 					properties[ii]->name,
-					widget, "active");
+					widget, "active",
+					G_BINDING_BIDIRECTIONAL |
+					G_BINDING_SYNC_CREATE);
 				gtk_widget_show (widget);
 				gtk_table_attach (
 					GTK_TABLE (table), widget,
diff --git a/mail/em-subscription-editor.c b/mail/em-subscription-editor.c
index 321d245477..6a4112db42 100644
--- a/mail/em-subscription-editor.c
+++ b/mail/em-subscription-editor.c
@@ -27,7 +27,6 @@
 #include "mail-mt.h"
 
 #include <e-util/e-util.h>
-#include <e-util/e-binding.h>
 #include <e-util/e-account-utils.h>
 #include <e-util/e-util-private.h>
 #include <e-util/gconf-bridge.h>
@@ -1222,9 +1221,11 @@ em_subscription_editor_init (EMSubscriptionEditor *editor)
 	editor->priv->notebook = widget;
 	gtk_widget_show (widget);
 
-	e_mutual_binding_new (
+	g_object_bind_property (
 		editor->priv->combo_box, "active",
-		editor->priv->notebook, "page");
+		editor->priv->notebook, "page",
+		G_BINDING_BIDIRECTIONAL |
+		G_BINDING_SYNC_CREATE);
 
 	widget = gtk_vbutton_box_new ();
 	gtk_box_set_spacing (GTK_BOX (widget), 6);
diff --git a/mail/em-utils.c b/mail/em-utils.c
index ab85007787..9f1f82ec50 100644
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@ -61,7 +61,6 @@
 #include <libedataserver/e-proxy.h>
 #include "e-util/e-util.h"
 #include "e-util/e-util-private.h"
-#include "e-util/e-binding.h"
 #include "e-util/e-mktemp.h"
 #include "e-util/e-account-utils.h"
 #include "e-util/e-dialog-utils.h"
@@ -394,12 +393,14 @@ em_utils_flag_for_followup (EMailReader *reader,
 	shell_settings = e_shell_get_shell_settings (shell);
 
 	/* These settings come from the calendar module. */
-	e_binding_new (
+	g_object_bind_property (
 		shell_settings, "cal-use-24-hour-format",
-		editor, "use-24-hour-format");
-	e_binding_new (
+		editor, "use-24-hour-format",
+		G_BINDING_SYNC_CREATE);
+	g_object_bind_property (
 		shell_settings, "cal-week-start-day",
-		editor, "week-start-day");
+		editor, "week-start-day",
+		G_BINDING_SYNC_CREATE);
 
 	for (i = 0; i < uids->len; i++) {
 		CamelMessageInfo *info;