[ekiga] Managed the accounts window through a smart pointer in the gtk+ frontend
- From: Julien Puydt <jpuydt src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ekiga] Managed the accounts window through a smart pointer in the gtk+ frontend
- Date: Wed, 19 Jun 2013 17:59:55 +0000 (UTC)
commit e9c8c190d93dc2af5b13adf664257185afc100b3
Author: Julien Puydt <jpuydt free fr>
Date: Wed Jun 19 08:27:57 2013 +0200
Managed the accounts window through a smart pointer in the gtk+ frontend
lib/engine/gui/gtk-frontend/gtk-frontend.cpp | 7 ++++---
lib/engine/gui/gtk-frontend/gtk-frontend.h | 2 +-
2 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/lib/engine/gui/gtk-frontend/gtk-frontend.cpp b/lib/engine/gui/gtk-frontend/gtk-frontend.cpp
index e08ff73..49f1a78 100644
--- a/lib/engine/gui/gtk-frontend/gtk-frontend.cpp
+++ b/lib/engine/gui/gtk-frontend/gtk-frontend.cpp
@@ -96,7 +96,6 @@ GtkFrontend::~GtkFrontend ()
// management
//gtk_widget_destroy (assistant_window);
- //gtk_widget_destroy (accounts_window);
//gtk_widget_destroy (chat_window);
//gtk_widget_destroy (call_window);
//if (status_icon)
@@ -117,7 +116,9 @@ void GtkFrontend::build ()
addressbook_window =
boost::shared_ptr<GtkWidget>(addressbook_window_new_with_key (*contact_core, "/apps/" PACKAGE_NAME
"/general/user_interface/addressbook_window"),
gtk_widget_destroy);
- accounts_window = accounts_window_new_with_key (core, "/apps/" PACKAGE_NAME
"/general/user_interface/accounts_window");
+ accounts_window =
+ boost::shared_ptr<GtkWidget> (accounts_window_new_with_key (core, "/apps/" PACKAGE_NAME
"/general/user_interface/accounts_window"),
+ gtk_widget_destroy);
assistant_window = ekiga_assistant_new (core);
call_window = call_window_new (core);
chat_window = chat_window_new (core, "/apps/" PACKAGE_NAME "/general/user_interface/chat_window");
@@ -160,7 +161,7 @@ const GtkWidget *GtkFrontend::get_addressbook_window () const
const GtkWidget *GtkFrontend::get_accounts_window () const
{
- return accounts_window;
+ return accounts_window.get ();
}
diff --git a/lib/engine/gui/gtk-frontend/gtk-frontend.h b/lib/engine/gui/gtk-frontend/gtk-frontend.h
index 300e49f..fd65fa0 100644
--- a/lib/engine/gui/gtk-frontend/gtk-frontend.h
+++ b/lib/engine/gui/gtk-frontend/gtk-frontend.h
@@ -85,7 +85,7 @@ private :
GtkWidget* main_window;
GtkWidget *preferences_window;
boost::shared_ptr<GtkWidget> addressbook_window;
- GtkWidget *accounts_window;
+ boost::shared_ptr<GtkWidget> accounts_window;
GtkWidget *call_window;
GtkWidget *chat_window;
StatusIcon *status_icon;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]