[ekiga] Simplified the addressbook window api

[Julien Puydt <jpuydt src gnome org>]

commit 5a1346dc6eccb9f46514b66fc374b6ebb9eec70b
Author: Julien Puydt <jpuydt free fr>
Date:   Thu Jun 20 18:15:15 2013 +0200

    Simplified the addressbook window api

 lib/engine/gui/gtk-frontend/addressbook-window.cpp |   12 ------------
 lib/engine/gui/gtk-frontend/addressbook-window.h   |    3 ---
 lib/engine/gui/gtk-frontend/gtk-frontend.cpp       |    6 ++++--
 3 files changed, 4 insertions(+), 17 deletions(-)
---
diff --git a/lib/engine/gui/gtk-frontend/addressbook-window.cpp 
b/lib/engine/gui/gtk-frontend/addressbook-window.cpp
index 3705cbc..1dddb83 100644
--- a/lib/engine/gui/gtk-frontend/addressbook-window.cpp
+++ b/lib/engine/gui/gtk-frontend/addressbook-window.cpp
@@ -739,15 +739,3 @@ addressbook_window_new (boost::shared_ptr<Ekiga::ContactCore> core)
 
   return GTK_WIDGET (self);
 }
-
-
-GtkWidget *
-addressbook_window_new_with_key (boost::shared_ptr<Ekiga::ContactCore> core,
-                                 const std::string _key)
-{
-  AddressBookWindow *self = ADDRESSBOOK_WINDOW (addressbook_window_new (core));
-  g_object_set (self, "key", _key.c_str (), NULL);
-
-  return GTK_WIDGET (self);
-}
-
diff --git a/lib/engine/gui/gtk-frontend/addressbook-window.h 
b/lib/engine/gui/gtk-frontend/addressbook-window.h
index 62b5bbe..d14a8f3 100644
--- a/lib/engine/gui/gtk-frontend/addressbook-window.h
+++ b/lib/engine/gui/gtk-frontend/addressbook-window.h
@@ -80,7 +80,4 @@ GType addressbook_window_get_type ();
 /* public api */
 GtkWidget* addressbook_window_new (boost::shared_ptr<Ekiga::ContactCore> core);
 
-GtkWidget* addressbook_window_new_with_key (boost::shared_ptr<Ekiga::ContactCore> core,
-                                            const std::string _key);
-
 #endif
diff --git a/lib/engine/gui/gtk-frontend/gtk-frontend.cpp b/lib/engine/gui/gtk-frontend/gtk-frontend.cpp
index 3bf5444..404f39e 100644
--- a/lib/engine/gui/gtk-frontend/gtk-frontend.cpp
+++ b/lib/engine/gui/gtk-frontend/gtk-frontend.cpp
@@ -135,8 +135,10 @@ GtkFrontend::build ()
   gtk_window_set_default_icon_name (GM_ICON_LOGO);
 
   addressbook_window =
-    boost::shared_ptr<GtkWidget>(addressbook_window_new_with_key (contact_core, "/apps/" PACKAGE_NAME 
"/general/user_interface/addressbook_window"),
-                                gtk_widget_destroy);
+    boost::shared_ptr<GtkWidget>(addressbook_window_new (contact_core), gtk_widget_destroy);
+  gm_window_set_key (GM_WINDOW (addressbook_window.get ()),
+                    "/apps/" PACKAGE_NAME "/general/user_interface/addressbook_window");
+
   accounts_window =
     boost::shared_ptr<GtkWidget> (accounts_window_new_with_key (core, "/apps/" PACKAGE_NAME 
"/general/user_interface/accounts_window"),