diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2009-12-16 02:48:19 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2009-12-17 18:38:49 +0800 |
| commit | c5b4c8eedb2f1f28cc8fedf21ceb42eadfcf1162 (patch) | |
| tree | 0dde364dd17ff04eeee6d9ee329cfafbe70f0fb9 /src | |
| parent | 83d23c5c7c31616c36a2c1dd6f1cb422f5d4d36b (diff) | |
| download | gsoc2013-empathy-c5b4c8eedb2f1f28cc8fedf21ceb42eadfcf1162.tar gsoc2013-empathy-c5b4c8eedb2f1f28cc8fedf21ceb42eadfcf1162.tar.gz gsoc2013-empathy-c5b4c8eedb2f1f28cc8fedf21ceb42eadfcf1162.tar.bz2 gsoc2013-empathy-c5b4c8eedb2f1f28cc8fedf21ceb42eadfcf1162.tar.lz gsoc2013-empathy-c5b4c8eedb2f1f28cc8fedf21ceb42eadfcf1162.tar.xz gsoc2013-empathy-c5b4c8eedb2f1f28cc8fedf21ceb42eadfcf1162.tar.zst gsoc2013-empathy-c5b4c8eedb2f1f28cc8fedf21ceb42eadfcf1162.zip | |
main-window: add "New Call" menu entry (#582599)
Diffstat (limited to 'src')
| -rw-r--r-- | src/empathy-main-window.c | 10 | ||||
| -rw-r--r-- | src/empathy-main-window.ui | 9 |
2 files changed, 19 insertions, 0 deletions
diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c index cbb6f10b0..162de3b45 100644 --- a/src/empathy-main-window.c +++ b/src/empathy-main-window.c @@ -46,6 +46,7 @@ #include <libempathy-gtk/empathy-geometry.h> #include <libempathy-gtk/empathy-gtk-enum-types.h> #include <libempathy-gtk/empathy-new-message-dialog.h> +#include <libempathy-gtk/empathy-new-call-dialog.h> #include <libempathy-gtk/empathy-log-window.h> #include <libempathy-gtk/empathy-presence-chooser.h> #include <libempathy-gtk/empathy-sound.h> @@ -669,6 +670,13 @@ main_window_chat_new_message_cb (GtkAction *action, } static void +main_window_chat_new_call_cb (GtkAction *action, + EmpathyMainWindow *window) +{ + empathy_new_call_dialog_show (GTK_WINDOW (window->window)); +} + +static void main_window_chat_add_contact_cb (GtkAction *action, EmpathyMainWindow *window) { @@ -1151,6 +1159,7 @@ main_window_connection_items_setup (EmpathyMainWindow *window, const gchar *actions_connected[] = { "room", "chat_new_message", + "chat_new_call", "chat_add_contact", "edit_personal_information" }; @@ -1254,6 +1263,7 @@ empathy_main_window_show (void) "main_window", "destroy", main_window_destroy_cb, "chat_quit", "activate", main_window_chat_quit_cb, "chat_new_message", "activate", main_window_chat_new_message_cb, + "chat_new_call", "activate", main_window_chat_new_call_cb, "view_history", "activate", main_window_view_history_cb, "room_join_new", "activate", main_window_room_join_new_cb, "room_join_favorites", "activate", main_window_room_join_favorites_cb, diff --git a/src/empathy-main-window.ui b/src/empathy-main-window.ui index b74f4acb9..1e6ecce17 100644 --- a/src/empathy-main-window.ui +++ b/src/empathy-main-window.ui @@ -19,6 +19,14 @@ <accelerator key="N" modifiers="GDK_CONTROL_MASK"/> </child> <child> + <object class="GtkAction" id="chat_new_call"> + <property name="icon-name">audio-input-microphone</property> + <property name="name">chat_new_call</property> + <property name="label" translatable="yes">New _Call...</property> + </object> + <accelerator key="M" modifiers="GDK_CONTROL_MASK"/> + </child> + <child> <object class="GtkAction" id="view_history"> <property name="icon-name">document-open-recent</property> <property name="name">view_history</property> @@ -212,6 +220,7 @@ <menubar name="menubar"> <menu action="chat"> <menuitem action="chat_new_message"/> + <menuitem action="chat_new_call"/> <separator/> <menuitem action="chat_add_contact"/> <separator/> |