From 75df7ae67b78f94dd69ac5c6ad079e3d360c8461 Mon Sep 17 00:00:00 2001 From: Emanuele Aina Date: Tue, 26 Mar 2013 23:19:28 +0100 Subject: 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 - libempathy/empathy-irc-networks.dtd | 18 - libempathy/irc-networks.xml | 545 --------------------- tp-account-widgets/Makefile.am | 10 + .../empathy-account-widgets.gresource.xml | 1 + tp-account-widgets/empathy-irc-network-manager.c | 4 +- tp-account-widgets/empathy-irc-networks.dtd | 18 + tp-account-widgets/irc-networks.xml | 545 +++++++++++++++++++++ 9 files changed, 578 insertions(+), 572 deletions(-) delete mode 100644 libempathy/empathy-irc-networks.dtd delete mode 100644 libempathy/irc-networks.xml create mode 100644 tp-account-widgets/empathy-irc-networks.dtd create mode 100644 tp-account-widgets/irc-networks.xml diff --git a/libempathy/Makefile.am b/libempathy/Makefile.am index 6759d9f17..56fb12202 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 76cc81702..f222363ce 100644 --- a/libempathy/empathy-dtd.gresource.xml +++ b/libempathy/empathy-dtd.gresource.xml @@ -4,7 +4,6 @@ empathy-status-presets.dtd empathy-contact-groups.dtd empathy-chatroom-manager.dtd - empathy-irc-networks.dtd diff --git a/libempathy/empathy-irc-networks.dtd b/libempathy/empathy-irc-networks.dtd deleted file mode 100644 index 692e613c1..000000000 --- a/libempathy/empathy-irc-networks.dtd +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/libempathy/irc-networks.xml b/libempathy/irc-networks.xml deleted file mode 100644 index 2526785c2..000000000 --- a/libempathy/irc-networks.xml +++ /dev/null @@ -1,545 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tp-account-widgets/Makefile.am b/tp-account-widgets/Makefile.am index 38a482e1b..d0c73bfa4 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 093cb2a93..7ee09e209 100644 --- a/tp-account-widgets/empathy-account-widgets.gresource.xml +++ b/tp-account-widgets/empathy-account-widgets.gresource.xml @@ -1,6 +1,7 @@ + empathy-irc-networks.dtd empathy-account-widget-generic.ui empathy-account-widget-jabber.ui empathy-account-widget-msn.ui diff --git a/tp-account-widgets/empathy-irc-network-manager.c b/tp-account-widgets/empathy-irc-network-manager.c index 3f53a49ad..26530338b 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/tp-account-widgets/empathy-irc-networks.dtd b/tp-account-widgets/empathy-irc-networks.dtd new file mode 100644 index 000000000..692e613c1 --- /dev/null +++ b/tp-account-widgets/empathy-irc-networks.dtd @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + diff --git a/tp-account-widgets/irc-networks.xml b/tp-account-widgets/irc-networks.xml new file mode 100644 index 000000000..2526785c2 --- /dev/null +++ b/tp-account-widgets/irc-networks.xml @@ -0,0 +1,545 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3