[ekiga/ds-gtk-application: 4/4] GtkFrontend: Renamed gtk-frontend.* into ekiga-app.*
- From: Damien Sandras <dsandras src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ekiga/ds-gtk-application: 4/4] GtkFrontend: Renamed gtk-frontend.* into ekiga-app.*
- Date: Sun, 2 Feb 2014 16:47:21 +0000 (UTC)
commit 399e2ee3541a9a15c1392b1b7650f83fb11590ea
Author: Damien Sandras <dsandras beip be>
Date: Sun Feb 2 17:45:56 2014 +0100
GtkFrontend: Renamed gtk-frontend.* into ekiga-app.*
This corresponds more to the current reality and future.
lib/Makefile.am | 4 ++--
lib/engine/engine.cpp | 1 -
lib/engine/gui/gtk-frontend/accounts-window.h | 2 +-
lib/engine/gui/gtk-frontend/addressbook-window.h | 2 +-
lib/engine/gui/gtk-frontend/assistant-window.cpp | 2 +-
lib/engine/gui/gtk-frontend/call-window.h | 2 +-
lib/engine/gui/gtk-frontend/chat-window.h | 2 +-
.../{gtk-frontend.cpp => ekiga-app.cpp} | 8 ++++----
.../gtk-frontend/{gtk-frontend.h => ekiga-app.h} | 6 +++---
lib/engine/gui/gtk-frontend/main_window.cpp | 2 +-
lib/engine/gui/gtk-frontend/main_window.h | 2 +-
lib/engine/gui/gtk-frontend/preferences-window.h | 2 +-
lib/engine/gui/gtk-frontend/statusicon.cpp | 2 +-
lib/engine/gui/gtk-frontend/statusicon.h | 2 +-
src/dbus-helper/dbus.cpp | 2 +-
src/dbus-helper/dbus.h | 2 +-
src/main.cpp | 2 +-
17 files changed, 22 insertions(+), 23 deletions(-)
---
diff --git a/lib/Makefile.am b/lib/Makefile.am
index afa6dd3..d476aa0 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -404,8 +404,8 @@ libekiga_la_SOURCES += \
engine/gui/gtk-frontend/statusmenu.cpp \
engine/gui/gtk-frontend/chat-window.h \
engine/gui/gtk-frontend/chat-window.cpp \
- engine/gui/gtk-frontend/gtk-frontend.h \
- engine/gui/gtk-frontend/gtk-frontend.cpp
+ engine/gui/gtk-frontend/ekiga-app.h \
+ engine/gui/gtk-frontend/ekiga-app.cpp
##
# Sources of the ptlib component
diff --git a/lib/engine/engine.cpp b/lib/engine/engine.cpp
index 4c61ecf..3aebc26 100644
--- a/lib/engine/engine.cpp
+++ b/lib/engine/engine.cpp
@@ -59,7 +59,6 @@
#include "local-roster-main.h"
#include "local-roster-bridge.h"
#include "gtk-core-main.h"
-#include "gtk-frontend.h"
#include "gmconf-personal-details.h"
#include "videooutput-main-clutter-gst.h"
diff --git a/lib/engine/gui/gtk-frontend/accounts-window.h b/lib/engine/gui/gtk-frontend/accounts-window.h
index 415d120..492c587 100644
--- a/lib/engine/gui/gtk-frontend/accounts-window.h
+++ b/lib/engine/gui/gtk-frontend/accounts-window.h
@@ -43,7 +43,7 @@
#include <gtk/gtk.h>
#include "gmwindow.h"
-#include "gtk-frontend.h"
+#include "ekiga-app.h"
typedef struct _AccountsWindow AccountsWindow;
typedef struct _AccountsWindowPrivate AccountsWindowPrivate;
diff --git a/lib/engine/gui/gtk-frontend/addressbook-window.h
b/lib/engine/gui/gtk-frontend/addressbook-window.h
index 6ea9e0c..11bc0be 100644
--- a/lib/engine/gui/gtk-frontend/addressbook-window.h
+++ b/lib/engine/gui/gtk-frontend/addressbook-window.h
@@ -42,7 +42,7 @@
#include "contact-core.h"
#include "gmwindow.h"
-#include "gtk-frontend.h"
+#include "ekiga-app.h"
typedef struct _AddressBookWindow AddressBookWindow;
diff --git a/lib/engine/gui/gtk-frontend/assistant-window.cpp
b/lib/engine/gui/gtk-frontend/assistant-window.cpp
index be84da1..9b3e85a 100644
--- a/lib/engine/gui/gtk-frontend/assistant-window.cpp
+++ b/lib/engine/gui/gtk-frontend/assistant-window.cpp
@@ -45,7 +45,7 @@
#include "platform.h"
#include "assistant-window.h"
#include "default_devices.h"
-#include "gtk-frontend.h"
+#include "ekiga-app.h"
#include "opal-bank.h"
#include "ekiga-settings.h"
diff --git a/lib/engine/gui/gtk-frontend/call-window.h b/lib/engine/gui/gtk-frontend/call-window.h
index 76ed411..14a9f35 100644
--- a/lib/engine/gui/gtk-frontend/call-window.h
+++ b/lib/engine/gui/gtk-frontend/call-window.h
@@ -40,7 +40,7 @@
#define __CALL_WINDOW_H__
#include "gmwindow.h"
-#include "gtk-frontend.h"
+#include "ekiga-app.h"
G_BEGIN_DECLS
diff --git a/lib/engine/gui/gtk-frontend/chat-window.h b/lib/engine/gui/gtk-frontend/chat-window.h
index 82eb2b6..a98f41a 100644
--- a/lib/engine/gui/gtk-frontend/chat-window.h
+++ b/lib/engine/gui/gtk-frontend/chat-window.h
@@ -41,7 +41,7 @@
#include "gmwindow.h"
#include "services.h"
-#include "gtk-frontend.h"
+#include "ekiga-app.h"
G_BEGIN_DECLS
diff --git a/lib/engine/gui/gtk-frontend/gtk-frontend.cpp b/lib/engine/gui/gtk-frontend/ekiga-app.cpp
similarity index 98%
rename from lib/engine/gui/gtk-frontend/gtk-frontend.cpp
rename to lib/engine/gui/gtk-frontend/ekiga-app.cpp
index c429347..b40923d 100644
--- a/lib/engine/gui/gtk-frontend/gtk-frontend.cpp
+++ b/lib/engine/gui/gtk-frontend/ekiga-app.cpp
@@ -27,9 +27,9 @@
/*
- * gtk-frontend.cpp - description
- * ------------------------------------------
- * begin : written in 2014 by Damien Sandras
+ * ekiga-app.cpp - description
+ * -----------------------------
+ * begin : written in Feb 2014 by Damien Sandras
* copyright : (c) 2014 by Damien Sandras
* description : main Ekiga GtkApplication
*
@@ -41,7 +41,7 @@
#include "ekiga-settings.h"
#include "trigger.h"
-#include "gtk-frontend.h"
+#include "ekiga-app.h"
#include "gmstockicons.h"
#include "account-core.h"
#include "chat-core.h"
diff --git a/lib/engine/gui/gtk-frontend/gtk-frontend.h b/lib/engine/gui/gtk-frontend/ekiga-app.h
similarity index 94%
rename from lib/engine/gui/gtk-frontend/gtk-frontend.h
rename to lib/engine/gui/gtk-frontend/ekiga-app.h
index 9beac78..21f0cc2 100644
--- a/lib/engine/gui/gtk-frontend/gtk-frontend.h
+++ b/lib/engine/gui/gtk-frontend/ekiga-app.h
@@ -27,9 +27,9 @@
/*
- * gtk-frontend.h - description
- * ------------------------------------------
- * begin : written in 2014 by Damien Sandras
+ * ekiga-app.cpp - description
+ * -----------------------------
+ * begin : written in Feb 2014 by Damien Sandras
* copyright : (c) 2014 by Damien Sandras
* description : main Ekiga GtkApplication
*
diff --git a/lib/engine/gui/gtk-frontend/main_window.cpp b/lib/engine/gui/gtk-frontend/main_window.cpp
index c99c5c2..56b52cd 100644
--- a/lib/engine/gui/gtk-frontend/main_window.cpp
+++ b/lib/engine/gui/gtk-frontend/main_window.cpp
@@ -62,7 +62,7 @@
#include "audioinput-core.h"
#include "audiooutput-core.h"
-#include "gtk-frontend.h"
+#include "ekiga-app.h"
#include "roster-view-gtk.h"
#include "call-history-view-gtk.h"
#include "history-source.h"
diff --git a/lib/engine/gui/gtk-frontend/main_window.h b/lib/engine/gui/gtk-frontend/main_window.h
index 1488c9c..37015aa 100644
--- a/lib/engine/gui/gtk-frontend/main_window.h
+++ b/lib/engine/gui/gtk-frontend/main_window.h
@@ -40,7 +40,7 @@
#define __MAIN_WINDOW_H__
#include "gmwindow.h"
-#include "gtk-frontend.h"
+#include "ekiga-app.h"
G_BEGIN_DECLS
diff --git a/lib/engine/gui/gtk-frontend/preferences-window.h
b/lib/engine/gui/gtk-frontend/preferences-window.h
index 959a2c4..619207f 100644
--- a/lib/engine/gui/gtk-frontend/preferences-window.h
+++ b/lib/engine/gui/gtk-frontend/preferences-window.h
@@ -48,7 +48,7 @@
#include "audiooutput-core.h"
#include "videoinput-core.h"
-#include "gtk-frontend.h"
+#include "ekiga-app.h"
typedef struct _PreferencesWindow PreferencesWindow;
typedef struct _PreferencesWindowPrivate PreferencesWindowPrivate;
diff --git a/lib/engine/gui/gtk-frontend/statusicon.cpp b/lib/engine/gui/gtk-frontend/statusicon.cpp
index 1cb71a8..6cf66ab 100644
--- a/lib/engine/gui/gtk-frontend/statusicon.cpp
+++ b/lib/engine/gui/gtk-frontend/statusicon.cpp
@@ -44,7 +44,7 @@
#include "gmmenuaddon.h"
#include "services.h"
-#include "gtk-frontend.h"
+#include "ekiga-app.h"
#include "call-core.h"
#include "notification-core.h"
#include "personal-details.h"
diff --git a/lib/engine/gui/gtk-frontend/statusicon.h b/lib/engine/gui/gtk-frontend/statusicon.h
index 38c49dc..f25c470 100644
--- a/lib/engine/gui/gtk-frontend/statusicon.h
+++ b/lib/engine/gui/gtk-frontend/statusicon.h
@@ -45,7 +45,7 @@
#include <boost/signals2.hpp>
#include <boost/bind.hpp>
-#include "gtk-frontend.h"
+#include "ekiga-app.h"
G_BEGIN_DECLS
diff --git a/src/dbus-helper/dbus.cpp b/src/dbus-helper/dbus.cpp
index bb266c9..7173a5c 100644
--- a/src/dbus-helper/dbus.cpp
+++ b/src/dbus-helper/dbus.cpp
@@ -42,7 +42,7 @@
#include "dbus.h"
#include "ekiga-settings.h"
-#include "gtk-frontend.h"
+#include "ekiga-app.h"
#include "call-core.h"
/* Those defines the namespace and path we want to use. */
diff --git a/src/dbus-helper/dbus.h b/src/dbus-helper/dbus.h
index 0181301..2e22483 100644
--- a/src/dbus-helper/dbus.h
+++ b/src/dbus-helper/dbus.h
@@ -41,7 +41,7 @@
#define __DBUS_COMPONENT_H
#include <glib-object.h>
-#include "gtk-frontend.h"
+#include "ekiga-app.h"
#include "framework/services.h"
diff --git a/src/main.cpp b/src/main.cpp
index 79651c5..02a687a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -60,7 +60,7 @@
#include "call-core.h"
-#include "gtk-frontend.h"
+#include "ekiga-app.h"
#include "ekiga.h"
#ifdef WIN32
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]