From ba499bfd6f960e26cd7776db7dd183137b705144 Mon Sep 17 00:00:00 2001
From: Marco Barisione <marco.barisione@collabora.co.uk>
Date: Wed, 8 May 2013 17:17:30 +0100
Subject: [PATCH] tp-account-widgets: rename all the files from empathy-* to
 tpaw-*

https://bugzilla.gnome.org/show_bug.cgi?id=699492
---
 .../empathy-local-xmpp-assistant-widget.c     |  2 +-
 libempathy-gtk/empathy-new-account-dialog.c   |  2 +-
 src/empathy-accounts-dialog.c                 |  2 +-
 tests/empathy-irc-network-manager-test.c      |  2 +-
 tests/empathy-irc-network-test.c              |  2 +-
 tests/empathy-irc-server-test.c               |  2 +-
 tests/test-irc-helper.h                       |  2 +-
 tp-account-widgets/.gitignore                 |  2 +-
 tp-account-widgets/Makefile.am                | 76 +++++++++----------
 .../empathy-account-widgets.gresource.xml     | 17 -----
 ...dget-aim.ui => tpaw-account-widget-aim.ui} |  0
 ...eric.ui => tpaw-account-widget-generic.ui} |  0
 ...se.ui => tpaw-account-widget-groupwise.ui} |  0
 ...dget-icq.ui => tpaw-account-widget-icq.ui} |  0
 ...widget-irc.c => tpaw-account-widget-irc.c} |  4 +-
 ...widget-irc.h => tpaw-account-widget-irc.h} |  4 +-
 ...dget-irc.ui => tpaw-account-widget-irc.ui} |  0
 ...abber.ui => tpaw-account-widget-jabber.ui} |  0
 ...p.ui => tpaw-account-widget-local-xmpp.ui} |  0
 ...dget-msn.ui => tpaw-account-widget-msn.ui} |  0
 ...rivate.h => tpaw-account-widget-private.h} |  2 +-
 ...widget-sip.c => tpaw-account-widget-sip.c} |  4 +-
 ...widget-sip.h => tpaw-account-widget-sip.h} |  2 +-
 ...dget-sip.ui => tpaw-account-widget-sip.ui} |  0
 ...-yahoo.ui => tpaw-account-widget-yahoo.ui} |  0
 ...account-widget.c => tpaw-account-widget.c} | 10 +--
 ...account-widget.h => tpaw-account-widget.h} |  0
 .../tpaw-account-widgets.gresource.xml        | 17 +++++
 ...og.c => tpaw-irc-network-chooser-dialog.c} |  8 +-
 ...og.h => tpaw-irc-network-chooser-dialog.h} |  2 +-
 ...k-chooser.c => tpaw-irc-network-chooser.c} |  6 +-
 ...k-chooser.h => tpaw-irc-network-chooser.h} |  2 +-
 ...ork-dialog.c => tpaw-irc-network-dialog.c} |  2 +-
 ...ork-dialog.h => tpaw-irc-network-dialog.h} |  2 +-
 ...k-manager.c => tpaw-irc-network-manager.c} |  4 +-
 ...k-manager.h => tpaw-irc-network-manager.h} |  2 +-
 ...pathy-irc-network.c => tpaw-irc-network.c} |  2 +-
 ...pathy-irc-network.h => tpaw-irc-network.h} |  2 +-
 ...irc-networks.dtd => tpaw-irc-networks.dtd} |  2 +-
 ...empathy-irc-server.c => tpaw-irc-server.c} |  2 +-
 ...empathy-irc-server.h => tpaw-irc-server.h} |  0
 .../empathy-accounts-plugin-widget.c          |  4 +-
 42 files changed, 96 insertions(+), 96 deletions(-)
 delete mode 100644 tp-account-widgets/empathy-account-widgets.gresource.xml
 rename tp-account-widgets/{empathy-account-widget-aim.ui => tpaw-account-widget-aim.ui} (100%)
 rename tp-account-widgets/{empathy-account-widget-generic.ui => tpaw-account-widget-generic.ui} (100%)
 rename tp-account-widgets/{empathy-account-widget-groupwise.ui => tpaw-account-widget-groupwise.ui} (100%)
 rename tp-account-widgets/{empathy-account-widget-icq.ui => tpaw-account-widget-icq.ui} (100%)
 rename tp-account-widgets/{empathy-account-widget-irc.c => tpaw-account-widget-irc.c} (98%)
 rename tp-account-widgets/{empathy-account-widget-irc.h => tpaw-account-widget-irc.h} (94%)
 rename tp-account-widgets/{empathy-account-widget-irc.ui => tpaw-account-widget-irc.ui} (100%)
 rename tp-account-widgets/{empathy-account-widget-jabber.ui => tpaw-account-widget-jabber.ui} (100%)
 rename tp-account-widgets/{empathy-account-widget-local-xmpp.ui => tpaw-account-widget-local-xmpp.ui} (100%)
 rename tp-account-widgets/{empathy-account-widget-msn.ui => tpaw-account-widget-msn.ui} (100%)
 rename tp-account-widgets/{empathy-account-widget-private.h => tpaw-account-widget-private.h} (97%)
 rename tp-account-widgets/{empathy-account-widget-sip.c => tpaw-account-widget-sip.c} (99%)
 rename tp-account-widgets/{empathy-account-widget-sip.h => tpaw-account-widget-sip.h} (96%)
 rename tp-account-widgets/{empathy-account-widget-sip.ui => tpaw-account-widget-sip.ui} (100%)
 rename tp-account-widgets/{empathy-account-widget-yahoo.ui => tpaw-account-widget-yahoo.ui} (100%)
 rename tp-account-widgets/{empathy-account-widget.c => tpaw-account-widget.c} (99%)
 rename tp-account-widgets/{empathy-account-widget.h => tpaw-account-widget.h} (100%)
 create mode 100644 tp-account-widgets/tpaw-account-widgets.gresource.xml
 rename tp-account-widgets/{empathy-irc-network-chooser-dialog.c => tpaw-irc-network-chooser-dialog.c} (99%)
 rename tp-account-widgets/{empathy-irc-network-chooser-dialog.h => tpaw-irc-network-chooser-dialog.h} (98%)
 rename tp-account-widgets/{empathy-irc-network-chooser.c => tpaw-irc-network-chooser.c} (98%)
 rename tp-account-widgets/{empathy-irc-network-chooser.h => tpaw-irc-network-chooser.h} (98%)
 rename tp-account-widgets/{empathy-irc-network-dialog.c => tpaw-irc-network-dialog.c} (99%)
 rename tp-account-widgets/{empathy-irc-network-dialog.h => tpaw-irc-network-dialog.h} (97%)
 rename tp-account-widgets/{empathy-irc-network-manager.c => tpaw-irc-network-manager.c} (99%)
 rename tp-account-widgets/{empathy-irc-network-manager.h => tpaw-irc-network-manager.h} (98%)
 rename tp-account-widgets/{empathy-irc-network.c => tpaw-irc-network.c} (99%)
 rename tp-account-widgets/{empathy-irc-network.h => tpaw-irc-network.h} (98%)
 rename tp-account-widgets/{empathy-irc-networks.dtd => tpaw-irc-networks.dtd} (91%)
 rename tp-account-widgets/{empathy-irc-server.c => tpaw-irc-server.c} (99%)
 rename tp-account-widgets/{empathy-irc-server.h => tpaw-irc-server.h} (100%)

diff --git a/libempathy-gtk/empathy-local-xmpp-assistant-widget.c b/libempathy-gtk/empathy-local-xmpp-assistant-widget.c
index 26d2bbf8..d9fecc1c 100644
--- a/libempathy-gtk/empathy-local-xmpp-assistant-widget.c
+++ b/libempathy-gtk/empathy-local-xmpp-assistant-widget.c
@@ -22,8 +22,8 @@
 #include "empathy-local-xmpp-assistant-widget.h"
 
 #include <glib/gi18n-lib.h>
+#include <tp-account-widgets/tpaw-account-widget.h>
 
-#include "empathy-account-widget.h"
 #include "empathy-ui-utils.h"
 #include "empathy-utils.h"
 
diff --git a/libempathy-gtk/empathy-new-account-dialog.c b/libempathy-gtk/empathy-new-account-dialog.c
index b26423f9..eaa8b07e 100644
--- a/libempathy-gtk/empathy-new-account-dialog.c
+++ b/libempathy-gtk/empathy-new-account-dialog.c
@@ -21,8 +21,8 @@
 #include "empathy-new-account-dialog.h"
 
 #include <glib/gi18n-lib.h>
+#include <tp-account-widgets/tpaw-account-widget.h>
 
-#include "empathy-account-widget.h"
 #include "empathy-protocol-chooser.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c
index 2d971994..a175261b 100644
--- a/src/empathy-accounts-dialog.c
+++ b/src/empathy-accounts-dialog.c
@@ -28,9 +28,9 @@
 #include "empathy-accounts-dialog.h"
 
 #include <glib/gi18n-lib.h>
+#include <tp-account-widgets/tpaw-account-widget.h>
 
 #include "empathy-accounts-common.h"
-#include "empathy-account-widget.h"
 #include "empathy-import-dialog.h"
 #include "empathy-import-utils.h"
 #include "empathy-local-xmpp-assistant-widget.h"
diff --git a/tests/empathy-irc-network-manager-test.c b/tests/empathy-irc-network-manager-test.c
index ac6d4bbd..7b7e7a42 100644
--- a/tests/empathy-irc-network-manager-test.c
+++ b/tests/empathy-irc-network-manager-test.c
@@ -2,8 +2,8 @@
 #include <stdio.h>
 #include <string.h>
 #include <glib/gstdio.h>
+#include <tp-account-widgets/tpaw-irc-network-manager.h>
 
-#include "empathy-irc-network-manager.h"
 #include "test-helper.h"
 #include "test-irc-helper.h"
 
diff --git a/tests/empathy-irc-network-test.c b/tests/empathy-irc-network-test.c
index 2657d788..c784641f 100644
--- a/tests/empathy-irc-network-test.c
+++ b/tests/empathy-irc-network-test.c
@@ -1,8 +1,8 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <tp-account-widgets/tpaw-irc-network.h>
 
-#include "empathy-irc-network.h"
 #include "test-helper.h"
 #include "test-irc-helper.h"
 
diff --git a/tests/empathy-irc-server-test.c b/tests/empathy-irc-server-test.c
index ff56a02d..fc0eb5b1 100644
--- a/tests/empathy-irc-server-test.c
+++ b/tests/empathy-irc-server-test.c
@@ -1,8 +1,8 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <tp-account-widgets/tpaw-irc-server.h>
 
-#include "empathy-irc-server.h"
 #include "test-helper.h"
 #include "test-irc-helper.h"
 
diff --git a/tests/test-irc-helper.h b/tests/test-irc-helper.h
index 2dedf50c..02eda917 100644
--- a/tests/test-irc-helper.h
+++ b/tests/test-irc-helper.h
@@ -1,6 +1,6 @@
 #include <string.h>
 
-#include "empathy-irc-network-manager.h"
+#include <tp-account-widgets/tpaw-irc-network-manager.h>
 
 #ifndef __CHECK_IRC_HELPER_H__
 #define __CHECK_IRC_HELPER_H__
diff --git a/tp-account-widgets/.gitignore b/tp-account-widgets/.gitignore
index 3c37f3d0..ac10b9d3 100644
--- a/tp-account-widgets/.gitignore
+++ b/tp-account-widgets/.gitignore
@@ -1 +1 @@
-empathy-account-widgets-resources.[ch]
+tpaw-account-widgets-resources.[ch]
diff --git a/tp-account-widgets/Makefile.am b/tp-account-widgets/Makefile.am
index d0c73bfa..0d2d5011 100644
--- a/tp-account-widgets/Makefile.am
+++ b/tp-account-widgets/Makefile.am
@@ -11,35 +11,35 @@ AM_CPPFLAGS =                                           \
 	$(DISABLE_DEPRECATED)
 
 BUILT_SOURCES = 					\
-	empathy-account-widgets-resources.c		\
-	empathy-account-widgets-resources.h		\
+	tpaw-account-widgets-resources.c		\
+	tpaw-account-widgets-resources.h		\
 	$(NULL)
 
 libtp_account_widgets_sources =            	\
-	empathy-account-widget.c		\
-	empathy-account-widget-irc.c		\
-	empathy-account-widget-private.h	\
-	empathy-account-widget-sip.c		\
-	empathy-irc-network-chooser.c		\
-	empathy-irc-network-chooser-dialog.c	\
-	empathy-irc-network-dialog.c		\
-	empathy-irc-network-manager.c		\
-	empathy-irc-network.c			\
-	empathy-irc-server.c			\
+	tpaw-account-widget.c			\
+	tpaw-account-widget-irc.c		\
+	tpaw-account-widget-private.h		\
+	tpaw-account-widget-sip.c		\
+	tpaw-irc-network-chooser.c		\
+	tpaw-irc-network-chooser-dialog.c	\
+	tpaw-irc-network-dialog.c		\
+	tpaw-irc-network-manager.c		\
+	tpaw-irc-network.c			\
+	tpaw-irc-server.c			\
 	totem-subtitle-encoding.c		\
 	$(NULL)
 
 libtp_account_widgets_headers =			\
-	empathy-account-widget.h		\
-	empathy-account-widget-irc.h		\
-	empathy-account-widget-sip.h		\
-	empathy-irc-network-chooser-dialog.h	\
-	empathy-irc-network-chooser.h		\
-	empathy-irc-network-dialog.h		\
-	empathy-irc-network-manager.h		\
-	empathy-irc-network.h			\
-	empathy-irc-server.h			\
-	empathy-utils.h				\
+	tpaw-account-widget.h			\
+	tpaw-account-widget-irc.h		\
+	tpaw-account-widget-sip.h		\
+	tpaw-irc-network-chooser-dialog.h	\
+	tpaw-irc-network-chooser.h		\
+	tpaw-irc-network-dialog.h		\
+	tpaw-irc-network-manager.h		\
+	tpaw-irc-network.h			\
+	tpaw-irc-server.h			\
+	tpaw-utils.h				\
 	totem-subtitle-encoding.h		\
 	$(NULL)
 
@@ -68,8 +68,8 @@ check_c_sources = \
 include $(top_srcdir)/tools/check-coding-style.mk
 check-local: check-coding-style
 
-account_widgets_dtd_files =			\
-	empathy-irc-networks.dtd		\
+account_widgets_dtd_files =		\
+	tpaw-irc-networks.dtd		\
 	$(NULL)
 
 ircnetworksdir = $(datadir)/empathy
@@ -77,28 +77,28 @@ ircnetworks_DATA =		\
 	irc-networks.xml
 
 account_widgets_ui_files =			\
-	empathy-account-widget-generic.ui	\
-	empathy-account-widget-jabber.ui	\
-	empathy-account-widget-msn.ui		\
-	empathy-account-widget-sip.ui		\
-	empathy-account-widget-local-xmpp.ui	\
-	empathy-account-widget-irc.ui		\
-	empathy-account-widget-icq.ui		\
-	empathy-account-widget-yahoo.ui		\
-	empathy-account-widget-groupwise.ui	\
-	empathy-account-widget-aim.ui		\
+	tpaw-account-widget-generic.ui		\
+	tpaw-account-widget-jabber.ui		\
+	tpaw-account-widget-msn.ui		\
+	tpaw-account-widget-sip.ui		\
+	tpaw-account-widget-local-xmpp.ui	\
+	tpaw-account-widget-irc.ui		\
+	tpaw-account-widget-icq.ui		\
+	tpaw-account-widget-yahoo.ui		\
+	tpaw-account-widget-groupwise.ui	\
+	tpaw-account-widget-aim.ui		\
 	$(NULL)
 
-account_widgets_resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir=$(srcdir) $(srcdir)/empathy-account-widgets.gresource.xml)
+account_widgets_resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir=$(srcdir) $(srcdir)/tpaw-account-widgets.gresource.xml)
 
-empathy-account-widgets-resources.c: empathy-account-widgets.gresource.xml $(account_widgets_resource_files)
+tpaw-account-widgets-resources.c: tpaw-account-widgets.gresource.xml $(account_widgets_resource_files)
 	$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source $<
 
-empathy-account-widgets-resources.h: empathy-account-widgets.gresource.xml $(account_widgets_resource_files)
+tpaw-account-widgets-resources.h: tpaw-account-widgets.gresource.xml $(account_widgets_resource_files)
 	$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-header $<
 
 EXTRA_DIST =					\
-	empathy-account-widgets.gresource.xml	\
+	tpaw-account-widgets.gresource.xml	\
 	$(account_widgets_dtd_files)		\
 	$(account_widgets_ui_files)		\
 	$(ircnetworks_DATA)			\
diff --git a/tp-account-widgets/empathy-account-widgets.gresource.xml b/tp-account-widgets/empathy-account-widgets.gresource.xml
deleted file mode 100644
index 7ee09e20..00000000
--- a/tp-account-widgets/empathy-account-widgets.gresource.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<gresources>
-  <gresource prefix="/org/gnome/AccountWidgets">
-    <file>empathy-irc-networks.dtd</file>
-    <file compressed="true">empathy-account-widget-generic.ui</file>
-    <file compressed="true">empathy-account-widget-jabber.ui</file>
-    <file compressed="true">empathy-account-widget-msn.ui</file>
-    <file compressed="true">empathy-account-widget-sip.ui</file>
-    <file compressed="true">empathy-account-widget-local-xmpp.ui</file>
-    <file compressed="true">empathy-account-widget-irc.ui</file>
-    <file compressed="true">empathy-account-widget-icq.ui</file>
-    <file compressed="true">empathy-account-widget-yahoo.ui</file>
-    <file compressed="true">empathy-account-widget-groupwise.ui</file>
-    <file compressed="true">empathy-account-widget-aim.ui</file>
-  </gresource>
-</gresources>
-
diff --git a/tp-account-widgets/empathy-account-widget-aim.ui b/tp-account-widgets/tpaw-account-widget-aim.ui
similarity index 100%
rename from tp-account-widgets/empathy-account-widget-aim.ui
rename to tp-account-widgets/tpaw-account-widget-aim.ui
diff --git a/tp-account-widgets/empathy-account-widget-generic.ui b/tp-account-widgets/tpaw-account-widget-generic.ui
similarity index 100%
rename from tp-account-widgets/empathy-account-widget-generic.ui
rename to tp-account-widgets/tpaw-account-widget-generic.ui
diff --git a/tp-account-widgets/empathy-account-widget-groupwise.ui b/tp-account-widgets/tpaw-account-widget-groupwise.ui
similarity index 100%
rename from tp-account-widgets/empathy-account-widget-groupwise.ui
rename to tp-account-widgets/tpaw-account-widget-groupwise.ui
diff --git a/tp-account-widgets/empathy-account-widget-icq.ui b/tp-account-widgets/tpaw-account-widget-icq.ui
similarity index 100%
rename from tp-account-widgets/empathy-account-widget-icq.ui
rename to tp-account-widgets/tpaw-account-widget-icq.ui
diff --git a/tp-account-widgets/empathy-account-widget-irc.c b/tp-account-widgets/tpaw-account-widget-irc.c
similarity index 98%
rename from tp-account-widgets/empathy-account-widget-irc.c
rename to tp-account-widgets/tpaw-account-widget-irc.c
index 417d309c..f98394bf 100644
--- a/tp-account-widgets/empathy-account-widget-irc.c
+++ b/tp-account-widgets/tpaw-account-widget-irc.c
@@ -19,9 +19,9 @@
  */
 
 #include "config.h"
-#include "empathy-account-widget-irc.h"
+#include "tpaw-account-widget-irc.h"
 
-#include "empathy-account-widget-private.h"
+#include "tpaw-account-widget-private.h"
 #include "empathy-ui-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT | EMPATHY_DEBUG_IRC
diff --git a/tp-account-widgets/empathy-account-widget-irc.h b/tp-account-widgets/tpaw-account-widget-irc.h
similarity index 94%
rename from tp-account-widgets/empathy-account-widget-irc.h
rename to tp-account-widgets/tpaw-account-widget-irc.h
index 991ab9ad..f913cbc5 100644
--- a/tp-account-widgets/empathy-account-widget-irc.h
+++ b/tp-account-widgets/tpaw-account-widget-irc.h
@@ -21,8 +21,8 @@
 #ifndef __TPAW_ACCOUNT_WIDGET_IRC_H__
 #define __TPAW_ACCOUNT_WIDGET_IRC_H__
 
-#include "empathy-account-widget.h"
-#include "empathy-irc-network-chooser.h"
+#include "tpaw-account-widget.h"
+#include "tpaw-irc-network-chooser.h"
 
 G_BEGIN_DECLS
 
diff --git a/tp-account-widgets/empathy-account-widget-irc.ui b/tp-account-widgets/tpaw-account-widget-irc.ui
similarity index 100%
rename from tp-account-widgets/empathy-account-widget-irc.ui
rename to tp-account-widgets/tpaw-account-widget-irc.ui
diff --git a/tp-account-widgets/empathy-account-widget-jabber.ui b/tp-account-widgets/tpaw-account-widget-jabber.ui
similarity index 100%
rename from tp-account-widgets/empathy-account-widget-jabber.ui
rename to tp-account-widgets/tpaw-account-widget-jabber.ui
diff --git a/tp-account-widgets/empathy-account-widget-local-xmpp.ui b/tp-account-widgets/tpaw-account-widget-local-xmpp.ui
similarity index 100%
rename from tp-account-widgets/empathy-account-widget-local-xmpp.ui
rename to tp-account-widgets/tpaw-account-widget-local-xmpp.ui
diff --git a/tp-account-widgets/empathy-account-widget-msn.ui b/tp-account-widgets/tpaw-account-widget-msn.ui
similarity index 100%
rename from tp-account-widgets/empathy-account-widget-msn.ui
rename to tp-account-widgets/tpaw-account-widget-msn.ui
diff --git a/tp-account-widgets/empathy-account-widget-private.h b/tp-account-widgets/tpaw-account-widget-private.h
similarity index 97%
rename from tp-account-widgets/empathy-account-widget-private.h
rename to tp-account-widgets/tpaw-account-widget-private.h
index 6b5c0608..28fc537f 100644
--- a/tp-account-widgets/empathy-account-widget-private.h
+++ b/tp-account-widgets/tpaw-account-widget-private.h
@@ -22,7 +22,7 @@
 #ifndef __TPAW_ACCOUNT_WIDGET_PRIVATE_H__
 #define __TPAW_ACCOUNT_WIDGET_PRIVATE_H__
 
-#include "empathy-account-widget.h"
+#include "tpaw-account-widget.h"
 
 G_BEGIN_DECLS
 
diff --git a/tp-account-widgets/empathy-account-widget-sip.c b/tp-account-widgets/tpaw-account-widget-sip.c
similarity index 99%
rename from tp-account-widgets/empathy-account-widget-sip.c
rename to tp-account-widgets/tpaw-account-widget-sip.c
index eb4a27a1..b28b0897 100644
--- a/tp-account-widgets/empathy-account-widget-sip.c
+++ b/tp-account-widgets/tpaw-account-widget-sip.c
@@ -20,11 +20,11 @@
  */
 
 #include "config.h"
-#include "empathy-account-widget-sip.h"
+#include "tpaw-account-widget-sip.h"
 
 #include <glib/gi18n-lib.h>
 
-#include "empathy-account-widget-private.h"
+#include "tpaw-account-widget-private.h"
 #include "empathy-ui-utils.h"
 
 typedef struct {
diff --git a/tp-account-widgets/empathy-account-widget-sip.h b/tp-account-widgets/tpaw-account-widget-sip.h
similarity index 96%
rename from tp-account-widgets/empathy-account-widget-sip.h
rename to tp-account-widgets/tpaw-account-widget-sip.h
index aac3004e..7f08ab1e 100644
--- a/tp-account-widgets/empathy-account-widget-sip.h
+++ b/tp-account-widgets/tpaw-account-widget-sip.h
@@ -21,7 +21,7 @@
 #ifndef __TPAW_ACCOUNT_WIDGET_SIP_H__
 #define __TPAW_ACCOUNT_WIDGET_SIP_H__
 
-#include "empathy-account-widget.h"
+#include "tpaw-account-widget.h"
 
 G_BEGIN_DECLS
 
diff --git a/tp-account-widgets/empathy-account-widget-sip.ui b/tp-account-widgets/tpaw-account-widget-sip.ui
similarity index 100%
rename from tp-account-widgets/empathy-account-widget-sip.ui
rename to tp-account-widgets/tpaw-account-widget-sip.ui
diff --git a/tp-account-widgets/empathy-account-widget-yahoo.ui b/tp-account-widgets/tpaw-account-widget-yahoo.ui
similarity index 100%
rename from tp-account-widgets/empathy-account-widget-yahoo.ui
rename to tp-account-widgets/tpaw-account-widget-yahoo.ui
diff --git a/tp-account-widgets/empathy-account-widget.c b/tp-account-widgets/tpaw-account-widget.c
similarity index 99%
rename from tp-account-widgets/empathy-account-widget.c
rename to tp-account-widgets/tpaw-account-widget.c
index a26d2ab0..7300ea10 100644
--- a/tp-account-widgets/empathy-account-widget.c
+++ b/tp-account-widgets/tpaw-account-widget.c
@@ -25,15 +25,15 @@
  */
 
 #include "config.h"
-#include "empathy-account-widget.h"
-#include "empathy-account-widget-private.h"
+#include "tpaw-account-widget.h"
+#include "tpaw-account-widget-private.h"
 
 #include <glib/gi18n-lib.h>
 #include <dbus/dbus-protocol.h>
 
-#include "empathy-account-widget-irc.h"
-#include "empathy-account-widget-private.h"
-#include "empathy-account-widget-sip.h"
+#include "tpaw-account-widget-irc.h"
+#include "tpaw-account-widget-private.h"
+#include "tpaw-account-widget-sip.h"
 #include "empathy-ui-utils.h"
 #include "empathy-utils.h"
 
diff --git a/tp-account-widgets/empathy-account-widget.h b/tp-account-widgets/tpaw-account-widget.h
similarity index 100%
rename from tp-account-widgets/empathy-account-widget.h
rename to tp-account-widgets/tpaw-account-widget.h
diff --git a/tp-account-widgets/tpaw-account-widgets.gresource.xml b/tp-account-widgets/tpaw-account-widgets.gresource.xml
new file mode 100644
index 00000000..6645041e
--- /dev/null
+++ b/tp-account-widgets/tpaw-account-widgets.gresource.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gnome/AccountWidgets">
+    <file>tpaw-irc-networks.dtd</file>
+    <file compressed="true">tpaw-account-widget-generic.ui</file>
+    <file compressed="true">tpaw-account-widget-jabber.ui</file>
+    <file compressed="true">tpaw-account-widget-msn.ui</file>
+    <file compressed="true">tpaw-account-widget-sip.ui</file>
+    <file compressed="true">tpaw-account-widget-local-xmpp.ui</file>
+    <file compressed="true">tpaw-account-widget-irc.ui</file>
+    <file compressed="true">tpaw-account-widget-icq.ui</file>
+    <file compressed="true">tpaw-account-widget-yahoo.ui</file>
+    <file compressed="true">tpaw-account-widget-groupwise.ui</file>
+    <file compressed="true">tpaw-account-widget-aim.ui</file>
+  </gresource>
+</gresources>
+
diff --git a/tp-account-widgets/empathy-irc-network-chooser-dialog.c b/tp-account-widgets/tpaw-irc-network-chooser-dialog.c
similarity index 99%
rename from tp-account-widgets/empathy-irc-network-chooser-dialog.c
rename to tp-account-widgets/tpaw-irc-network-chooser-dialog.c
index cd0a7168..2d50b8a0 100644
--- a/tp-account-widgets/empathy-irc-network-chooser-dialog.c
+++ b/tp-account-widgets/tpaw-irc-network-chooser-dialog.c
@@ -20,19 +20,19 @@
  */
 
 #include "config.h"
-#include "empathy-irc-network-chooser-dialog.h"
+#include "tpaw-irc-network-chooser-dialog.h"
 
 #include <glib/gi18n-lib.h>
 
-#include "empathy-irc-network-dialog.h"
-#include "empathy-irc-network-manager.h"
+#include "tpaw-irc-network-dialog.h"
+#include "tpaw-irc-network-manager.h"
 #include "empathy-live-search.h"
 #include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT | EMPATHY_DEBUG_IRC
 #include "empathy-debug.h"
 
-#include "empathy-irc-network-chooser-dialog.h"
+#include "tpaw-irc-network-chooser-dialog.h"
 
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, TpawIrcNetworkChooserDialog)
 
diff --git a/tp-account-widgets/empathy-irc-network-chooser-dialog.h b/tp-account-widgets/tpaw-irc-network-chooser-dialog.h
similarity index 98%
rename from tp-account-widgets/empathy-irc-network-chooser-dialog.h
rename to tp-account-widgets/tpaw-irc-network-chooser-dialog.h
index b1d5c21c..e2080290 100644
--- a/tp-account-widgets/empathy-irc-network-chooser-dialog.h
+++ b/tp-account-widgets/tpaw-irc-network-chooser-dialog.h
@@ -25,7 +25,7 @@
 #include <gtk/gtk.h>
 
 #include "empathy-account-settings.h"
-#include "empathy-irc-network.h"
+#include "tpaw-irc-network.h"
 
 G_BEGIN_DECLS
 
diff --git a/tp-account-widgets/empathy-irc-network-chooser.c b/tp-account-widgets/tpaw-irc-network-chooser.c
similarity index 98%
rename from tp-account-widgets/empathy-irc-network-chooser.c
rename to tp-account-widgets/tpaw-irc-network-chooser.c
index e64fdaec..9d0ac013 100644
--- a/tp-account-widgets/empathy-irc-network-chooser.c
+++ b/tp-account-widgets/tpaw-irc-network-chooser.c
@@ -20,10 +20,10 @@
  */
 
 #include "config.h"
-#include "empathy-irc-network-chooser.h"
+#include "tpaw-irc-network-chooser.h"
 
-#include "empathy-irc-network-chooser-dialog.h"
-#include "empathy-irc-network-manager.h"
+#include "tpaw-irc-network-chooser-dialog.h"
+#include "tpaw-irc-network-manager.h"
 #include "empathy-ui-utils.h"
 #include "empathy-utils.h"
 
diff --git a/tp-account-widgets/empathy-irc-network-chooser.h b/tp-account-widgets/tpaw-irc-network-chooser.h
similarity index 98%
rename from tp-account-widgets/empathy-irc-network-chooser.h
rename to tp-account-widgets/tpaw-irc-network-chooser.h
index e2bb1577..fcba21ab 100644
--- a/tp-account-widgets/empathy-irc-network-chooser.h
+++ b/tp-account-widgets/tpaw-irc-network-chooser.h
@@ -25,7 +25,7 @@
 #include <gtk/gtk.h>
 
 #include "empathy-account-settings.h"
-#include "empathy-irc-network.h"
+#include "tpaw-irc-network.h"
 
 G_BEGIN_DECLS
 
diff --git a/tp-account-widgets/empathy-irc-network-dialog.c b/tp-account-widgets/tpaw-irc-network-dialog.c
similarity index 99%
rename from tp-account-widgets/empathy-irc-network-dialog.c
rename to tp-account-widgets/tpaw-irc-network-dialog.c
index 86836376..502d2ca7 100644
--- a/tp-account-widgets/empathy-irc-network-dialog.c
+++ b/tp-account-widgets/tpaw-irc-network-dialog.c
@@ -19,7 +19,7 @@
  */
 
 #include "config.h"
-#include "empathy-irc-network-dialog.h"
+#include "tpaw-irc-network-dialog.h"
 
 #include <glib/gi18n-lib.h>
 
diff --git a/tp-account-widgets/empathy-irc-network-dialog.h b/tp-account-widgets/tpaw-irc-network-dialog.h
similarity index 97%
rename from tp-account-widgets/empathy-irc-network-dialog.h
rename to tp-account-widgets/tpaw-irc-network-dialog.h
index a879ea48..a65754bb 100644
--- a/tp-account-widgets/empathy-irc-network-dialog.h
+++ b/tp-account-widgets/tpaw-irc-network-dialog.h
@@ -23,7 +23,7 @@
 
 #include <gtk/gtk.h>
 
-#include "empathy-irc-network.h"
+#include "tpaw-irc-network.h"
 
 G_BEGIN_DECLS
 
diff --git a/tp-account-widgets/empathy-irc-network-manager.c b/tp-account-widgets/tpaw-irc-network-manager.c
similarity index 99%
rename from tp-account-widgets/empathy-irc-network-manager.c
rename to tp-account-widgets/tpaw-irc-network-manager.c
index 2bf84e2d..e6fdebac 100644
--- a/tp-account-widgets/empathy-irc-network-manager.c
+++ b/tp-account-widgets/tpaw-irc-network-manager.c
@@ -19,7 +19,7 @@
  */
 
 #include "config.h"
-#include "empathy-irc-network-manager.h"
+#include "tpaw-irc-network-manager.h"
 
 #include <sys/stat.h>
 
@@ -28,7 +28,7 @@
 #define DEBUG_FLAG EMPATHY_DEBUG_IRC
 #include "empathy-debug.h"
 
-#define IRC_NETWORKS_DTD_RESOURCENAME "/org/gnome/AccountWidgets/empathy-irc-networks.dtd"
+#define IRC_NETWORKS_DTD_RESOURCENAME "/org/gnome/AccountWidgets/tpaw-irc-networks.dtd"
 #define IRC_NETWORKS_FILENAME "irc-networks.xml"
 #define SAVE_TIMER 4
 
diff --git a/tp-account-widgets/empathy-irc-network-manager.h b/tp-account-widgets/tpaw-irc-network-manager.h
similarity index 98%
rename from tp-account-widgets/empathy-irc-network-manager.h
rename to tp-account-widgets/tpaw-irc-network-manager.h
index a708a3e2..feb6e28a 100644
--- a/tp-account-widgets/empathy-irc-network-manager.h
+++ b/tp-account-widgets/tpaw-irc-network-manager.h
@@ -23,7 +23,7 @@
 
 #include <glib-object.h>
 
-#include "empathy-irc-network.h"
+#include "tpaw-irc-network.h"
 
 G_BEGIN_DECLS
 
diff --git a/tp-account-widgets/empathy-irc-network.c b/tp-account-widgets/tpaw-irc-network.c
similarity index 99%
rename from tp-account-widgets/empathy-irc-network.c
rename to tp-account-widgets/tpaw-irc-network.c
index cda171b7..8d45eb32 100644
--- a/tp-account-widgets/empathy-irc-network.c
+++ b/tp-account-widgets/tpaw-irc-network.c
@@ -20,7 +20,7 @@
  */
 
 #include "config.h"
-#include "empathy-irc-network.h"
+#include "tpaw-irc-network.h"
 
 #include "empathy-utils.h"
 
diff --git a/tp-account-widgets/empathy-irc-network.h b/tp-account-widgets/tpaw-irc-network.h
similarity index 98%
rename from tp-account-widgets/empathy-irc-network.h
rename to tp-account-widgets/tpaw-irc-network.h
index e5a6aa3f..9fb414f3 100644
--- a/tp-account-widgets/empathy-irc-network.h
+++ b/tp-account-widgets/tpaw-irc-network.h
@@ -23,7 +23,7 @@
 
 #include <glib-object.h>
 
-#include "empathy-irc-server.h"
+#include "tpaw-irc-server.h"
 
 G_BEGIN_DECLS
 
diff --git a/tp-account-widgets/empathy-irc-networks.dtd b/tp-account-widgets/tpaw-irc-networks.dtd
similarity index 91%
rename from tp-account-widgets/empathy-irc-networks.dtd
rename to tp-account-widgets/tpaw-irc-networks.dtd
index 692e613c..599081f0 100644
--- a/tp-account-widgets/empathy-irc-networks.dtd
+++ b/tp-account-widgets/tpaw-irc-networks.dtd
@@ -1,5 +1,5 @@
 <!--
-  DTD for Empathys irc networks.
+  DTD for tp-account-widgets irc networks.
   by Xavier Claessens <xclaesse@gmail.com>
 -->
 
diff --git a/tp-account-widgets/empathy-irc-server.c b/tp-account-widgets/tpaw-irc-server.c
similarity index 99%
rename from tp-account-widgets/empathy-irc-server.c
rename to tp-account-widgets/tpaw-irc-server.c
index 4b085706..aa9b5332 100644
--- a/tp-account-widgets/empathy-irc-server.c
+++ b/tp-account-widgets/tpaw-irc-server.c
@@ -19,7 +19,7 @@
  */
 
 #include "config.h"
-#include "empathy-irc-server.h"
+#include "tpaw-irc-server.h"
 
 #include "empathy-utils.h"
 
diff --git a/tp-account-widgets/empathy-irc-server.h b/tp-account-widgets/tpaw-irc-server.h
similarity index 100%
rename from tp-account-widgets/empathy-irc-server.h
rename to tp-account-widgets/tpaw-irc-server.h
diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c
index 58074eec..c0f29e2c 100644
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c
+++ b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c
@@ -21,7 +21,7 @@
 
 #include "config.h"
 
-#include "empathy-accounts-plugin-widget.h"
+#include "tpaw-accounts-plugin-widget.h"
 
 #include <glib/gi18n-lib.h>
 
@@ -30,7 +30,7 @@
 #include <libaccounts-glib/ag-service.h>
 #include <libaccounts-glib/ag-account-service.h>
 
-#include "empathy-account-widget.h"
+#include "tpaw-account-widget.h"
 
 G_DEFINE_TYPE (EmpathyAccountsPluginWidget, empathy_accounts_plugin_widget, GTK_TYPE_BOX)
 
-- 
2.39.2