[empathy] tp-account-widgets: Move the IRC network list with the related sources

[Marco Barisione <mbari src gnome org>]

commit 75df7ae67b78f94dd69ac5c6ad079e3d360c8461
Author: Emanuele Aina <emanuele aina collabora com>
Date:   Tue Mar 26 23:19:28 2013 +0100

    tp-account-widgets: Move the IRC network list with the related sources
    
    https://bugzilla.gnome.org/show_bug.cgi?id=699492

 libempathy/Makefile.am                             |    8 ++------
 libempathy/empathy-dtd.gresource.xml               |    1 -
 tp-account-widgets/Makefile.am                     |   10 ++++++++++
 .../empathy-account-widgets.gresource.xml          |    1 +
 tp-account-widgets/empathy-irc-network-manager.c   |    4 ++--
 .../empathy-irc-networks.dtd                       |    0
 .../irc-networks.xml                               |    0
 7 files changed, 15 insertions(+), 9 deletions(-)
---
diff --git a/libempathy/Makefile.am b/libempathy/Makefile.am
index 6759d9f..56fb122 100644
--- a/libempathy/Makefile.am
+++ b/libempathy/Makefile.am
@@ -133,11 +133,7 @@ dtd_resources_files =                              \
        empathy-status-presets.dtd              \
        empathy-contact-groups.dtd              \
        empathy-chatroom-manager.dtd            \
-       empathy-irc-networks.dtd
-
-ircnetworksdir = $(datadir)/empathy
-ircnetworks_DATA =             \
-       irc-networks.xml
+       $(NULL)
 
 dtd_resource_files: $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies 
$(srcdir)/empathy-dtd.gresource.xml)
 
@@ -150,7 +146,7 @@ empathy-dtd-resources.h: empathy-dtd.gresource.xml $(dtd_resource_files)
 EXTRA_DIST =                           \
        empathy-dtd.gresource.xml       \
        $(dtd_resources_files)          \
-       $(ircnetworks_DATA)
+       $(NULL)
 
 CLEANFILES =                           \
        $(BUILT_SOURCES)                \
diff --git a/libempathy/empathy-dtd.gresource.xml b/libempathy/empathy-dtd.gresource.xml
index 76cc817..f222363 100644
--- a/libempathy/empathy-dtd.gresource.xml
+++ b/libempathy/empathy-dtd.gresource.xml
@@ -4,7 +4,6 @@
     <file>empathy-status-presets.dtd</file>
     <file>empathy-contact-groups.dtd</file>
     <file>empathy-chatroom-manager.dtd</file>
-    <file>empathy-irc-networks.dtd</file>
   </gresource>
 </gresources>
 
diff --git a/tp-account-widgets/Makefile.am b/tp-account-widgets/Makefile.am
index 38a482e..d0c73bf 100644
--- a/tp-account-widgets/Makefile.am
+++ b/tp-account-widgets/Makefile.am
@@ -68,6 +68,14 @@ check_c_sources = \
 include $(top_srcdir)/tools/check-coding-style.mk
 check-local: check-coding-style
 
+account_widgets_dtd_files =                    \
+       empathy-irc-networks.dtd                \
+       $(NULL)
+
+ircnetworksdir = $(datadir)/empathy
+ircnetworks_DATA =             \
+       irc-networks.xml
+
 account_widgets_ui_files =                     \
        empathy-account-widget-generic.ui       \
        empathy-account-widget-jabber.ui        \
@@ -91,7 +99,9 @@ empathy-account-widgets-resources.h: empathy-account-widgets.gresource.xml $(acc
 
 EXTRA_DIST =                                   \
        empathy-account-widgets.gresource.xml   \
+       $(account_widgets_dtd_files)            \
        $(account_widgets_ui_files)             \
+       $(ircnetworks_DATA)                     \
        $(NULL)
 
 CLEANFILES =                           \
diff --git a/tp-account-widgets/empathy-account-widgets.gresource.xml 
b/tp-account-widgets/empathy-account-widgets.gresource.xml
index 093cb2a..7ee09e2 100644
--- a/tp-account-widgets/empathy-account-widgets.gresource.xml
+++ b/tp-account-widgets/empathy-account-widgets.gresource.xml
@@ -1,6 +1,7 @@
 <?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>
diff --git a/tp-account-widgets/empathy-irc-network-manager.c 
b/tp-account-widgets/empathy-irc-network-manager.c
index 3f53a49..2653033 100644
--- a/tp-account-widgets/empathy-irc-network-manager.c
+++ b/tp-account-widgets/empathy-irc-network-manager.c
@@ -28,7 +28,7 @@
 #define DEBUG_FLAG EMPATHY_DEBUG_IRC
 #include "empathy-debug.h"
 
-#define IRC_NETWORKS_DTD_RESOURCENAME "/org/gnome/Empathy/empathy-irc-networks.dtd"
+#define IRC_NETWORKS_DTD_RESOURCENAME "/org/gnome/AccountWidgets/empathy-irc-networks.dtd"
 #define IRC_NETWORKS_FILENAME "irc-networks.xml"
 #define SAVE_TIMER 4
 
@@ -833,7 +833,7 @@ empathy_irc_network_manager_dup_default (void)
   g_free (dir);
 
   global_file_with_path = g_build_filename (g_getenv ("EMPATHY_SRCDIR"),
-      "libempathy", IRC_NETWORKS_FILENAME, NULL);
+      "tp-account-widgets", IRC_NETWORKS_FILENAME, NULL);
   if (!g_file_test (global_file_with_path, G_FILE_TEST_EXISTS))
     {
       g_free (global_file_with_path);
diff --git a/libempathy/empathy-irc-networks.dtd b/tp-account-widgets/empathy-irc-networks.dtd
similarity index 100%
rename from libempathy/empathy-irc-networks.dtd
rename to tp-account-widgets/empathy-irc-networks.dtd
diff --git a/libempathy/irc-networks.xml b/tp-account-widgets/irc-networks.xml
similarity index 100%
rename from libempathy/irc-networks.xml
rename to tp-account-widgets/irc-networks.xml