[ekiga] Renamed main.h and main.cpp to main_window.h and main_window.cpp

[Julien Puydt <jpuydt src gnome org>]

commit 8ea0d73aae53edc5c35c32dffa05f4c6e017ada5
Author: Julien Puydt <jpuydt gnome org>
Date:   Thu Oct 15 11:33:25 2009 +0200

    Renamed main.h and main.cpp to main_window.h and main_window.cpp
    
    That's what they are in fact. Next step is to push the main function in either src/ekiga.cpp... or src/main.cpp,
    so only the main window code is in src/gui/main_window.cpp (!)

 configure.ac                          |    2 +-
 src/Makefile.am                       |    4 ++--
 src/ekiga.cpp                         |    2 +-
 src/gui/accounts.cpp                  |    2 +-
 src/gui/callbacks.cpp                 |    2 +-
 src/gui/conf.cpp                      |    2 +-
 src/gui/{main.cpp => main_window.cpp} |    2 +-
 src/gui/{main.h => main_window.h}     |    4 ++--
 8 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 0e6e368..43ca319 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ AC_INIT(ekiga, 3.3.1, http://bugzilla.gnome.org/enter_bug.cgi?product=ekiga)
 AC_CANONICAL_TARGET
 AC_PREREQ(2.53)
 AC_CONFIG_MACRO_DIR([m4])
-AC_CONFIG_SRCDIR(src/gui/main.cpp)
+AC_CONFIG_SRCDIR(src/ekiga.cpp)
 AM_INIT_AUTOMAKE
 
 AM_MAINTAINER_MODE
diff --git a/src/Makefile.am b/src/Makefile.am
index ee9e8ed..891cc41 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -69,8 +69,8 @@ ekiga_SOURCES +=			\
 	gui/dialpad.cpp			\
 	gui/assistant.h			\
 	gui/assistant.cpp		\
-	gui/main.h			\
-	gui/main.cpp			\
+	gui/main_window.h		\
+	gui/main_window.cpp		\
 	gui/misc.h			\
 	gui/misc.cpp			\
 	gui/preferences.h		\
diff --git a/src/ekiga.cpp b/src/ekiga.cpp
index 4c1f411..9369442 100644
--- a/src/ekiga.cpp
+++ b/src/ekiga.cpp
@@ -45,7 +45,7 @@
 #include "assistant.h"
 #include "statusicon.h"
 #include "accounts.h"
-#include "main.h"
+#include "main_window.h"
 #include "misc.h"
 
 #ifdef HAVE_DBUS
diff --git a/src/gui/accounts.cpp b/src/gui/accounts.cpp
index f4062aa..79d9670 100644
--- a/src/gui/accounts.cpp
+++ b/src/gui/accounts.cpp
@@ -44,7 +44,7 @@
 
 #include "callbacks.h"
 #include "misc.h"
-#include "main.h"
+#include "main_window.h"
 #include "preferences.h"
 
 #include "gmconf.h"
diff --git a/src/gui/callbacks.cpp b/src/gui/callbacks.cpp
index 4ffa686..315fc70 100644
--- a/src/gui/callbacks.cpp
+++ b/src/gui/callbacks.cpp
@@ -40,7 +40,7 @@
 #include "config.h"
 
 #include "callbacks.h"
-#include "main.h"
+#include "main_window.h"
 #include "misc.h"
 
 #include "ekiga.h"
diff --git a/src/gui/conf.cpp b/src/gui/conf.cpp
index 74875a5..ec29f58 100644
--- a/src/gui/conf.cpp
+++ b/src/gui/conf.cpp
@@ -49,7 +49,7 @@
 #include "preferences.h"
 #include "assistant.h"
 #include "accounts.h"
-#include "main.h"
+#include "main_window.h"
 #include "misc.h"
 
 #include "gmdialog.h"
diff --git a/src/gui/main.cpp b/src/gui/main_window.cpp
similarity index 99%
rename from src/gui/main.cpp
rename to src/gui/main_window.cpp
index a6937da..c3bcd34 100644
--- a/src/gui/main.cpp
+++ b/src/gui/main_window.cpp
@@ -39,7 +39,7 @@
 
 #include "config.h"
 
-#include "main.h"
+#include "main_window.h"
 
 #include "ekiga.h"
 #include "conf.h"
diff --git a/src/gui/main.h b/src/gui/main_window.h
similarity index 99%
rename from src/gui/main.h
rename to src/gui/main_window.h
index e5f4e0c..3dac2c8 100644
--- a/src/gui/main.h
+++ b/src/gui/main_window.h
@@ -36,8 +36,8 @@
  */
 
 
-#ifndef _MAIN_INTERFACE_H
-#define _MAIN_INTERFACE_H
+#ifndef __MAIN_WINDOW_H__
+#define __MAIN_WINDOW_H__
 
 #include "services.h"
 #include "call.h"