[ekiga/ds-gtk-application] RosterViewGtk: Handle the case where there is no Actor menu.
- From: Damien Sandras <dsandras src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ekiga/ds-gtk-application] RosterViewGtk: Handle the case where there is no Actor menu.
- Date: Sun, 7 Dec 2014 16:29:42 +0000 (UTC)
commit cbfc497de96e27f2e16204c6c0026c8f70f7a2fd
Author: Damien Sandras <dsandras seconix com>
Date: Sun Dec 7 17:28:03 2014 +0100
RosterViewGtk: Handle the case where there is no Actor menu.
lib/engine/gui/gtk-frontend/roster-view-gtk.cpp | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp b/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp
index 3f6c508..07530ad 100644
--- a/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp
+++ b/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp
@@ -782,7 +782,7 @@ on_view_event_after (GtkWidget *tree_view,
case TYPE_HEAP:
if (event->type == GDK_BUTTON_PRESS && event->button == 1 && name)
on_clicked_fold (self, path, name);
- else if (event->type == GDK_BUTTON_PRESS && event->button == 3)
+ else if (event->type == GDK_BUTTON_PRESS && event->button == 3 && self->priv->heap_menu->get_menu ())
gtk_menu_popup (GTK_MENU (self->priv->heap_menu->get_menu ()),
NULL, NULL, NULL, NULL, event->button, event->time);
break;
@@ -791,7 +791,7 @@ on_view_event_after (GtkWidget *tree_view,
on_clicked_fold (self, path, group_name);
break;
case TYPE_PRESENTITY:
- if (event->type == GDK_BUTTON_PRESS && event->button == 3)
+ if (event->type == GDK_BUTTON_PRESS && event->button == 3 && self->priv->presentity_menu->get_menu ())
gtk_menu_popup (GTK_MENU (self->priv->presentity_menu->get_menu ()),
NULL, NULL, NULL, NULL, event->button, event->time);
else if (event->type == GDK_2BUTTON_PRESS || event->type == GDK_KEY_PRESS)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]