aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>2011-08-02 20:15:57 +0800
committerEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>2011-08-04 17:10:19 +0800
commitd89a90c582166d20b9a5c165d5784e434fc1de7f (patch)
tree6c4745b4e6653c0bed6d0ed506c6fa96b62fb7f1
parent1132cbda320d086176a0228f3addf5f7288ef080 (diff)
downloadgsoc2013-empathy-d89a90c582166d20b9a5c165d5784e434fc1de7f.tar
gsoc2013-empathy-d89a90c582166d20b9a5c165d5784e434fc1de7f.tar.gz
gsoc2013-empathy-d89a90c582166d20b9a5c165d5784e434fc1de7f.tar.bz2
gsoc2013-empathy-d89a90c582166d20b9a5c165d5784e434fc1de7f.tar.lz
gsoc2013-empathy-d89a90c582166d20b9a5c165d5784e434fc1de7f.tar.xz
gsoc2013-empathy-d89a90c582166d20b9a5c165d5784e434fc1de7f.tar.zst
gsoc2013-empathy-d89a90c582166d20b9a5c165d5784e434fc1de7f.zip
CallWindow: add a Help->About menu
https://bugzilla.gnome.org/show_bug.cgi?id=655884
-rw-r--r--src/Makefile.am2
-rw-r--r--src/empathy-call-window.c9
-rw-r--r--src/empathy-call-window.ui7
3 files changed, 18 insertions, 0 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index c232652c1..40adee61f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -159,6 +159,8 @@ empathy_call_SOURCES = \
empathy-call-window.h \
empathy-call-window-fullscreen.c \
empathy-call-window-fullscreen.h \
+ empathy-about-dialog.c \
+ empathy-about-dialog.h \
empathy-audio-sink.c \
empathy-audio-sink.h \
empathy-audio-src.c \
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index 52a1907d7..bcbadc7e0 100644
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -58,6 +58,7 @@
#include "empathy-call-window-fullscreen.h"
#include "empathy-call-factory.h"
#include "empathy-video-widget.h"
+#include "empathy-about-dialog.h"
#include "empathy-audio-src.h"
#include "empathy-audio-sink.h"
#include "empathy-video-src.h"
@@ -736,6 +737,13 @@ empathy_call_window_contents_cb (GtkAction *action,
empathy_url_show (GTK_WIDGET (self), "ghelp:empathy?audio-video");
}
+static void
+empathy_call_window_about_cb (GtkAction *action,
+ EmpathyCallWindow *self)
+{
+ empathy_about_dialog_new (GTK_WINDOW (self));
+}
+
static gboolean
empathy_call_window_configure_event_cb (GtkWidget *widget,
GdkEvent *event,
@@ -831,6 +839,7 @@ empathy_call_window_init (EmpathyCallWindow *self)
"dialpad", "toggled", empathy_call_window_dialpad_cb,
"menufullscreen", "activate", empathy_call_window_fullscreen_cb,
"menucontents", "activate", empathy_call_window_contents_cb,
+ "menuabout", "activate", empathy_call_window_about_cb,
"menupreviewdisable", "activate", empathy_call_window_disable_camera_cb,
"menupreviewminimise", "activate", empathy_call_window_minimise_camera_cb,
"menupreviewmaximise", "activate", empathy_call_window_maximise_camera_cb,
diff --git a/src/empathy-call-window.ui b/src/empathy-call-window.ui
index 70a1fa9ee..234219103 100644
--- a/src/empathy-call-window.ui
+++ b/src/empathy-call-window.ui
@@ -45,6 +45,12 @@
<accelerator key="F1" modifiers=""/>
</child>
<child>
+ <object class="GtkAction" id="menuabout">
+ <property name="stock_id">gtk-about</property>
+ <property name="name">menuabout</property>
+ </object>
+ </child>
+ <child>
<object class="GtkAction" id="menupreviewminimise">
<property name="name">menupreviewminimise</property>
<property name="label" translatable="yes">Minimise me</property>
@@ -74,6 +80,7 @@
</menu>
<menu action="help">
<menuitem name="menucontents" action="menucontents"/>
+ <menuitem name="menuabout" action="menuabout"/>
</menu>
</menubar>
<popup name="video-popup">