diff options
| author | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2009-06-05 00:09:44 +0800 |
|---|---|---|
| committer | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2009-06-05 00:09:44 +0800 |
| commit | b1d33938778faa1faa3687e87bb8646d6668992d (patch) | |
| tree | 4c1676f40a867ae06462f3e788b710912a56eea9 /src/empathy-main-window.c | |
| parent | b788f7ca76096138b65f4518fb4435608cd0f91f (diff) | |
| parent | c06f26d8c999b47c22dcd78f07140d027e8882c7 (diff) | |
| download | gsoc2013-empathy-b1d33938778faa1faa3687e87bb8646d6668992d.tar gsoc2013-empathy-b1d33938778faa1faa3687e87bb8646d6668992d.tar.gz gsoc2013-empathy-b1d33938778faa1faa3687e87bb8646d6668992d.tar.bz2 gsoc2013-empathy-b1d33938778faa1faa3687e87bb8646d6668992d.tar.lz gsoc2013-empathy-b1d33938778faa1faa3687e87bb8646d6668992d.tar.xz gsoc2013-empathy-b1d33938778faa1faa3687e87bb8646d6668992d.tar.zst gsoc2013-empathy-b1d33938778faa1faa3687e87bb8646d6668992d.zip | |
Merge branch 'debug'
Conflicts:
extensions/Makefile.am
extensions/misc.xml
po/POTFILES.in
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
Diffstat (limited to 'src/empathy-main-window.c')
| -rw-r--r-- | src/empathy-main-window.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c index 6dcd6975e..5830d2b71 100644 --- a/src/empathy-main-window.c +++ b/src/empathy-main-window.c @@ -55,6 +55,7 @@ #include "ephy-spinner.h" #include "empathy-preferences.h" #include "empathy-about-dialog.h" +#include "empathy-debug-dialog.h" #include "empathy-new-chatroom-dialog.h" #include "empathy-map-view.h" #include "empathy-chatrooms-window.h" @@ -946,6 +947,13 @@ main_window_help_about_cb (GtkAction *action, } static void +main_window_help_debug_cb (GtkAction *action, + EmpathyMainWindow *window) +{ + empathy_debug_dialog_new (GTK_WINDOW (window->window)); +} + +static void main_window_help_contents_cb (GtkAction *action, EmpathyMainWindow *window) { @@ -1157,6 +1165,7 @@ empathy_main_window_show (void) "edit_personal_information", "activate", main_window_edit_personal_information_cb, "edit_preferences", "activate", main_window_edit_preferences_cb, "help_about", "activate", main_window_help_about_cb, + "help_debug", "activate", main_window_help_debug_cb, "help_contents", "activate", main_window_help_contents_cb, NULL); |