[ekiga] RosterView: Fixed Actor actions in case nothing is selected.



commit 414f2e059a75eb67bb5b592679aec0bb825df04d
Author: Damien Sandras <dsandras seconix com>
Date:   Sat Dec 27 10:52:54 2014 +0100

    RosterView: Fixed Actor actions in case nothing is selected.
    
    We need to reset the GActorMenu in that case too.

 lib/engine/gui/gtk-frontend/roster-view-gtk.cpp |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp b/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp
index 4a7721c..efaf9e4 100644
--- a/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp
+++ b/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp
@@ -686,6 +686,12 @@ on_selection_changed (GtkTreeSelection* selection,
   self = ROSTER_VIEW_GTK (data);
   model = gtk_tree_view_get_model (self->priv->tree_view);
 
+  /* Reset old data. This also ensures GIO actions are
+   * properly removed before adding new ones.
+   */
+  self->priv->presentity_menu.reset ();
+  self->priv->heap_menu.reset ();
+
   if (gtk_tree_selection_get_selected (selection, &model, &iter)) {
 
     gtk_tree_model_get (model, &iter,
@@ -696,12 +702,6 @@ on_selection_changed (GtkTreeSelection* selection,
                         COLUMN_PRESENTITY, &presentity,
                         -1);
 
-    /* Reset old data. This also ensures GIO actions are
-     * properly removed before adding new ones.
-     */
-    self->priv->presentity_menu.reset ();
-    self->priv->heap_menu.reset ();
-
     if (heap != NULL)
       self->priv->heap_menu = Ekiga::GActorMenuPtr (new Ekiga::GActorMenu (*heap, heap->get_name ()));
     if (presentity != NULL)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]