[ekiga] Use a warning status icon in case of failure.
- From: Damien Sandras <dsandras src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [ekiga] Use a warning status icon in case of failure.
- Date: Sun, 25 Oct 2009 16:59:01 +0000 (UTC)
commit aa32d0044aac949f3d8946a45dedc4d9ee5a292c
Author: Damien Sandras <dsandras seconix com>
Date: Sun Oct 25 17:57:50 2009 +0100
Use a warning status icon in case of failure.
If accounts fail to be enabled, the status icon is changed into a warning
icon.
src/gui/statusicon.cpp | 59 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 59 insertions(+), 0 deletions(-)
---
diff --git a/src/gui/statusicon.cpp b/src/gui/statusicon.cpp
index 0617766..b8335f8 100644
--- a/src/gui/statusicon.cpp
+++ b/src/gui/statusicon.cpp
@@ -69,6 +69,7 @@ struct _StatusIconPrivate
gboolean has_message;
std::vector<boost::signals::connection> connections;
+ std::list<std::string> failed_accounts;
int blink_id;
std::string status;
@@ -137,6 +138,12 @@ cleared_call_cb (boost::shared_ptr<Ekiga::CallManager> manager,
std::string reason,
gpointer self);
+static void
+on_account_updated (Ekiga::BankPtr bank,
+ Ekiga::AccountPtr account,
+ gpointer data);
+
+
/*
* GObject stuff
*/
@@ -382,6 +389,54 @@ cleared_call_cb (boost::shared_ptr<Ekiga::CallManager> /*manager*/,
}
+static bool
+on_visit_accounts (Ekiga::AccountPtr account,
+ gpointer data)
+{
+ if (account->is_enabled () && !account->is_active ())
+ STATUSICON (data)->priv->failed_accounts.push_back (account->get_name ());
+
+ return true;
+}
+
+
+static bool
+on_visit_banks (Ekiga::BankPtr bank,
+ gpointer data)
+{
+ bank->visit_accounts (boost::bind (&on_visit_accounts, _1, data));
+
+ return true;
+}
+
+
+static void
+on_account_updated (Ekiga::BankPtr /*bank*/,
+ Ekiga::AccountPtr /*account*/,
+ gpointer data)
+{
+ boost::shared_ptr<Ekiga::AccountCore> account_core = STATUSICON (data)->priv->core.get<Ekiga::AccountCore> ("account-core");
+ STATUSICON (data)->priv->failed_accounts.clear ();
+
+ account_core->visit_banks (boost::bind (&on_visit_banks, _1, data));
+
+ if (STATUSICON (data)->priv->failed_accounts.size () > 0) {
+
+ // FIXME use main_window here
+ boost::shared_ptr<GtkFrontend> frontend = STATUSICON (data)->priv->core.get<GtkFrontend> ("gtk-frontend");
+ GtkWidget *chat_window = chat_window = GTK_WIDGET (frontend->get_chat_window ());
+ GdkPixbuf *pixbuf = gtk_widget_render_icon (chat_window,
+ GTK_STOCK_DIALOG_WARNING,
+ GTK_ICON_SIZE_MENU,
+ NULL);
+ gtk_status_icon_set_from_pixbuf (GTK_STATUS_ICON (data), pixbuf);
+ g_object_unref (pixbuf);
+ }
+ else
+ statusicon_set_status (STATUSICON (data), STATUSICON (data)->priv->status);
+}
+
+
/*
* Local functions
*/
@@ -543,6 +598,7 @@ statusicon_new (Ekiga::ServiceCore & core)
boost::shared_ptr<GtkFrontend> frontend = core.get<GtkFrontend> ("gtk-frontend");
boost::shared_ptr<Ekiga::PersonalDetails> details = core.get<Ekiga::PersonalDetails> ("personal-details");
boost::shared_ptr<Ekiga::CallCore> call_core = core.get<Ekiga::CallCore> ("call-core");
+ boost::shared_ptr<Ekiga::AccountCore> account_core = core.get<Ekiga::AccountCore> ("account-core");
GtkWidget *chat_window = GTK_WIDGET (frontend->get_chat_window ());
statusicon_set_status (self, details->get_presence ());
@@ -557,6 +613,9 @@ statusicon_new (Ekiga::ServiceCore & core)
(gpointer) self));
self->priv->connections.push_back (conn);
+ conn = account_core->account_updated.connect (boost::bind (&on_account_updated, _1, _2, (gpointer) self));
+ self->priv->connections.push_back (conn);
+
g_signal_connect (self, "popup-menu",
G_CALLBACK (show_popup_menu_cb), self->priv->popup_menu);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]