aboutsummaryrefslogtreecommitdiffstats
path: root/modules/addressbook
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2010-10-14 11:40:16 +0800
committerMatthew Barnes <mbarnes@redhat.com>2010-10-14 19:12:52 +0800
commit1e663aa13266cad55e5019c03e768a38955166eb (patch)
tree6d7a3e20d3a24f004d0db4ab1c06d8a768b2f112 /modules/addressbook
parent3f58ba3d833953c29bb6aa5e1834e2f367f15202 (diff)
downloadgsoc2013-evolution-1e663aa13266cad55e5019c03e768a38955166eb.tar.gz
gsoc2013-evolution-1e663aa13266cad55e5019c03e768a38955166eb.tar.zst
gsoc2013-evolution-1e663aa13266cad55e5019c03e768a38955166eb.zip
Replace EBinding with GBinding.
GObject now does property bindings itself. Requires GLib >= 2.26.
Diffstat (limited to 'modules/addressbook')
-rw-r--r--modules/addressbook/autocompletion-config.c7
-rw-r--r--modules/addressbook/e-book-shell-content.c11
-rw-r--r--modules/addressbook/e-book-shell-view-actions.c10
-rw-r--r--modules/addressbook/e-book-shell-view-private.h1
4 files changed, 18 insertions, 11 deletions
diff --git a/modules/addressbook/autocompletion-config.c b/modules/addressbook/autocompletion-config.c
index c7ee192962..05b2b980d3 100644
--- a/modules/addressbook/autocompletion-config.c
+++ b/modules/addressbook/autocompletion-config.c
@@ -30,7 +30,6 @@
#include <libedataserverui/e-source-selector.h>
#include <libedataserverui/e-name-selector-entry.h>
-#include "e-util/e-binding.h"
#include "e-util/e-datetime-format.h"
static void
@@ -166,9 +165,11 @@ autocompletion_config_new (EPreferencesWindow *window)
widget = gtk_check_button_new_with_mnemonic (
_("Always _show address of the autocompleted contact"));
- e_mutual_binding_new (
+ g_object_bind_property (
shell_settings, "book-completion-show-address",
- widget, "active");
+ widget, "active",
+ G_BINDING_BIDIRECTIONAL |
+ G_BINDING_SYNC_CREATE);
gtk_box_pack_start (GTK_BOX (itembox), widget, FALSE, FALSE, 0);
gtk_widget_show (widget);
diff --git a/modules/addressbook/e-book-shell-content.c b/modules/addressbook/e-book-shell-content.c
index 13b9b4bd49..1d510fb3b7 100644
--- a/modules/addressbook/e-book-shell-content.c
+++ b/modules/addressbook/e-book-shell-content.c
@@ -23,7 +23,6 @@
#include <glib/gi18n.h>
-#include "e-util/e-binding.h"
#include "e-util/e-selection.h"
#include "e-util/gconf-bridge.h"
#include "shell/e-shell-utils.h"
@@ -245,7 +244,10 @@ book_shell_content_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 = widget;
@@ -277,7 +279,10 @@ book_shell_content_constructed (GObject *object)
priv->preview_pane = g_object_ref (widget);
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);
/* Restore pane positions from the last session once
* the shell view is fully initialized and visible. */
diff --git a/modules/addressbook/e-book-shell-view-actions.c b/modules/addressbook/e-book-shell-view-actions.c
index 9008002c33..9c13e599a7 100644
--- a/modules/addressbook/e-book-shell-view-actions.c
+++ b/modules/addressbook/e-book-shell-view-actions.c
@@ -1073,13 +1073,15 @@ e_book_shell_view_actions_init (EBookShellView *book_shell_view)
ACTION (GAL_SAVE_CUSTOM_VIEW), "activate",
G_CALLBACK (action_gal_save_custom_view_cb), book_shell_view);
- e_binding_new (
+ g_object_bind_property (
ACTION (CONTACT_PREVIEW), "active",
- ACTION (CONTACT_VIEW_CLASSIC), "sensitive");
+ ACTION (CONTACT_VIEW_CLASSIC), "sensitive",
+ G_BINDING_SYNC_CREATE);
- e_binding_new (
+ g_object_bind_property (
ACTION (CONTACT_PREVIEW), "active",
- ACTION (CONTACT_VIEW_VERTICAL), "sensitive");
+ ACTION (CONTACT_VIEW_VERTICAL), "sensitive",
+ G_BINDING_SYNC_CREATE);
e_web_view_set_open_proxy (web_view, ACTION (CONTACT_OPEN));
e_web_view_set_print_proxy (web_view, ACTION (CONTACT_PRINT));
diff --git a/modules/addressbook/e-book-shell-view-private.h b/modules/addressbook/e-book-shell-view-private.h
index 28ccae1359..b0b9592210 100644
--- a/modules/addressbook/e-book-shell-view-private.h
+++ b/modules/addressbook/e-book-shell-view-private.h
@@ -34,7 +34,6 @@
#include <libedataserverui/e-source-selector.h>
#include "e-util/e-util.h"
-#include "e-util/e-binding.h"
#include "e-util/e-file-utils.h"
#include "e-util/gconf-bridge.h"
#include "shell/e-shell-content.h"