diff options
| author | Xavier Claessens <xclaesse@gmail.com> | 2009-08-26 15:54:29 +0800 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2009-08-26 15:57:55 +0800 |
| commit | 1669cc99bae84e2506bb6b671843bd980f16b2bc (patch) | |
| tree | e5bf576707f8de238a2b29a0fc7236ab49e8c7b8 /src/empathy-main-window.c | |
| parent | fbaa6100736ae6fd627b7f299bc9fab421a33e0f (diff) | |
| parent | 13c650f07be34d376c9ef4e7966e470198cedf52 (diff) | |
| download | gsoc2013-empathy-1669cc99bae84e2506bb6b671843bd980f16b2bc.tar gsoc2013-empathy-1669cc99bae84e2506bb6b671843bd980f16b2bc.tar.gz gsoc2013-empathy-1669cc99bae84e2506bb6b671843bd980f16b2bc.tar.bz2 gsoc2013-empathy-1669cc99bae84e2506bb6b671843bd980f16b2bc.tar.lz gsoc2013-empathy-1669cc99bae84e2506bb6b671843bd980f16b2bc.tar.xz gsoc2013-empathy-1669cc99bae84e2506bb6b671843bd980f16b2bc.tar.zst gsoc2013-empathy-1669cc99bae84e2506bb6b671843bd980f16b2bc.zip | |
Merge branch 'debug-window'
Conflicts:
src/empathy-debug-window.c
Diffstat (limited to 'src/empathy-main-window.c')
| -rw-r--r-- | src/empathy-main-window.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c index d61a05c27..8fb127b90 100644 --- a/src/empathy-main-window.c +++ b/src/empathy-main-window.c @@ -54,7 +54,7 @@ #include "ephy-spinner.h" #include "empathy-preferences.h" #include "empathy-about-dialog.h" -#include "empathy-debug-dialog.h" +#include "empathy-debug-window.h" #include "empathy-new-chatroom-dialog.h" #include "empathy-map-view.h" #include "empathy-chatrooms-window.h" @@ -1064,7 +1064,7 @@ static void main_window_help_debug_cb (GtkAction *action, EmpathyMainWindow *window) { - empathy_debug_dialog_new (GTK_WINDOW (window->window)); + empathy_debug_window_new (GTK_WINDOW (window->window)); } static void |