CallWindow: add a Help->About menu

https://bugzilla.gnome.org/show_bug.cgi?id=655884

diff --git a/src/Makefile.am b/src/Makefile.am
index c232652c1061840920e0f8821e176980dc4dc2fb..40adee61fbe65977db9d56c7a3e7575aefebb4ca 100644 (file)
--- 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 52a1907d789a3919b0475b83ad440753d9066f93..bcbadc7e0b29de73f1bc1ebd027376daa978c7e4 100644 (file)
--- 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 70a1fa9ee09030118fc4dc1a89beba2fa180566f..2342191036f74bfdc45fb314a0700218cb71c57b 100644 (file)
--- a/src/empathy-call-window.ui
+++ b/src/empathy-call-window.ui
@@ -44,6 +44,12 @@
           </object>
           <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>
@@ -74,6 +80,7 @@
         </menu>
         <menu action="help">
           <menuitem name="menucontents" action="menucontents"/>
+          <menuitem name="menuabout" action="menuabout"/>
         </menu>
       </menubar>
       <popup name="video-popup">