[ekiga/ds-gtk-application] Main Window: Got rid of the Trigger.
- From: Damien Sandras <dsandras src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ekiga/ds-gtk-application] Main Window: Got rid of the Trigger.
- Date: Sun, 30 Mar 2014 17:50:23 +0000 (UTC)
commit d994a256a24ea6877e11d94841d43ae961e59b20
Author: Damien Sandras <dsandras beip be>
Date: Sun Mar 30 19:48:38 2014 +0200
Main Window: Got rid of the Trigger.
This is not required anymore. The Trigger was executing the most
significant action of a Trigger object.
You can simply use global actions exported by the object itself.
lib/engine/gui/gtk-frontend/main_window.cpp | 30 +--------------------------
1 files changed, 1 insertions(+), 29 deletions(-)
---
diff --git a/lib/engine/gui/gtk-frontend/main_window.cpp b/lib/engine/gui/gtk-frontend/main_window.cpp
index ff40b08..c07914c 100644
--- a/lib/engine/gui/gtk-frontend/main_window.cpp
+++ b/lib/engine/gui/gtk-frontend/main_window.cpp
@@ -48,7 +48,6 @@
#include "gmentrydialog.h"
#include "gmstatusbar.h"
#include "gmmenuaddon.h"
-#include "trigger.h"
#include "menu-builder-tools.h"
#include "menu-builder-gtk.h"
#include "scoped-connections.h"
@@ -114,7 +113,6 @@ struct _EkigaMainWindowPrivate
boost::shared_ptr<Ekiga::ContactCore> contact_core;
boost::shared_ptr<Ekiga::PresenceCore> presence_core;
boost::shared_ptr<Opal::Bank> bank;
- boost::shared_ptr<Ekiga::Trigger> local_cluster_trigger;
boost::shared_ptr<History::Source> history_source;
GtkWidget *call_window;
@@ -182,7 +180,7 @@ static const char* win_menu =
" <section>"
" <item>"
" <attribute name='label' translatable='yes'>_Add Contact</attribute>"
- " <attribute name='action'>win.add</attribute>"
+ " <attribute name='action'>win.local-cluster-new</attribute>"
" </item>"
" </section>"
" <section>"
@@ -253,15 +251,6 @@ static void show_dialpad_activated (G_GNUC_UNUSED GSimpleAction *action,
gpointer data);
-/** Pull a trigger from a Ekiga::Service
- *
- * @param data is a pointer to the EkigaMainWindow.
- */
-static void pull_trigger_activated (G_GNUC_UNUSED GSimpleAction *action,
- G_GNUC_UNUSED GVariant *parameter,
- gpointer data);
-
-
/* DESCRIPTION : This callback is called when the user tries to close
* the application using the window manager.
* BEHAVIOR : Calls the real callback if the notification icon is
@@ -316,7 +305,6 @@ static void ekiga_main_window_push_message (EkigaMainWindow *main_window,
static GActionEntry win_entries[] =
{
- { "add", pull_trigger_activated, NULL, NULL, NULL, 0 },
{ "close", close_activated, NULL, NULL, NULL, 0 }
};
@@ -678,20 +666,6 @@ show_dialpad_activated (G_GNUC_UNUSED GSimpleAction *action,
static void
-pull_trigger_activated (G_GNUC_UNUSED GSimpleAction *action,
- G_GNUC_UNUSED GVariant *parameter,
- gpointer self)
-{
- g_return_if_fail (EKIGA_IS_MAIN_WINDOW (self));
- boost::shared_ptr<Ekiga::Trigger> trigger = EKIGA_MAIN_WINDOW (self)->priv->local_cluster_trigger;
-
- g_return_if_fail (trigger != NULL);
-
- trigger->pull ();
-}
-
-
-static void
close_activated (G_GNUC_UNUSED GSimpleAction *action,
G_GNUC_UNUSED GVariant *parameter,
gpointer data)
@@ -1266,8 +1240,6 @@ gm_main_window_new (GmApplication *app)
= core->get<Ekiga::PresenceCore> ("presence-core");
mw->priv->bank
= core->get<Opal::Bank> ("opal-account-store");
- mw->priv->local_cluster_trigger
- = core->get<Ekiga::Trigger> ("local-cluster");
mw->priv->history_source
= core->get<History::Source> ("call-history-store");
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]