GNOME.org
 

[empathy] tp-account-widgets: Move account widgets code in the tp-account-widgets subdir

commit 5cbc27ef0f4373175af5725d1a0b78d464bb23b3
Author: Emanuele Aina <emanuele aina collabora com>
Date:   Mon Mar 25 16:38:16 2013 +0100

    tp-account-widgets: Move account widgets code in the tp-account-widgets subdir
    
    Start moving the account widgets code in a subdir before fully isolating
    it and stubbing it out in a submodule.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=699492

 Makefile.am                                        |    5 +-
 configure.ac                                       |    1 +
 libempathy-gtk/.gitignore                          |    1 -
 libempathy-gtk/Makefile.am                         |   29 +------
 src/Makefile.am                                    |    2 +
 tp-account-widgets/.gitignore                      |    1 +
 tp-account-widgets/Makefile.am                     |   94 ++++++++++++++++++++
 .../empathy-account-widget-aim.ui                  |    0
 .../empathy-account-widget-generic.ui              |    0
 .../empathy-account-widget-groupwise.ui            |    0
 .../empathy-account-widget-icq.ui                  |    0
 .../empathy-account-widget-irc.c                   |    0
 .../empathy-account-widget-irc.h                   |    0
 .../empathy-account-widget-irc.ui                  |    0
 .../empathy-account-widget-jabber.ui               |    0
 .../empathy-account-widget-local-xmpp.ui           |    0
 .../empathy-account-widget-msn.ui                  |    0
 .../empathy-account-widget-private.h               |    0
 .../empathy-account-widget-sip.c                   |    0
 .../empathy-account-widget-sip.h                   |    0
 .../empathy-account-widget-sip.ui                  |    0
 .../empathy-account-widget-yahoo.ui                |    0
 .../empathy-account-widget.c                       |    0
 .../empathy-account-widget.h                       |    0
 .../empathy-account-widgets.gresource.xml          |    0
 .../empathy-irc-network-chooser-dialog.c           |    0
 .../empathy-irc-network-chooser-dialog.h           |    0
 .../empathy-irc-network-chooser.c                  |    0
 .../empathy-irc-network-chooser.h                  |    0
 .../empathy-irc-network-dialog.c                   |    0
 .../empathy-irc-network-dialog.h                   |    0
 .../totem-subtitle-encoding.c                      |    0
 .../totem-subtitle-encoding.h                      |    0
 33 files changed, 104 insertions(+), 29 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index dc120d5..0a8b1cb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,11 +1,12 @@
 MY_SUBDIRS = tools extensions po data libempathy libempathy-gtk src help tests
+TPAW_SUBDIRS = tp-account-widgets
 NST_SUBDIRS = nautilus-sendto-plugin
 GOA_SUBDIRS = goa-mc-plugin
 UOA_SUBDIRS = ubuntu-online-accounts
 
-DIST_SUBDIRS = $(MY_SUBDIRS) $(NST_SUBDIRS) $(GOA_SUBDIRS) $(UOA_SUBDIRS)
+DIST_SUBDIRS = $(TPAW_SUBDIRS) $(MY_SUBDIRS) $(NST_SUBDIRS) $(GOA_SUBDIRS) $(UOA_SUBDIRS)
 
-SUBDIRS = $(MY_SUBDIRS)
+SUBDIRS = $(TPAW_SUBDIRS) $(MY_SUBDIRS)
 
 if HAVE_NST
 SUBDIRS += $(NST_SUBDIRS)
diff --git a/configure.ac b/configure.ac
index b0228ec..d0291e6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -637,6 +637,7 @@ AC_CONFIG_FILES([
    data/themes/Makefile
    extensions/Makefile
    po/Makefile.in
+   tp-account-widgets/Makefile
    libempathy/Makefile
    libempathy-gtk/Makefile
    src/Makefile
diff --git a/libempathy-gtk/.gitignore b/libempathy-gtk/.gitignore
index 3e651d7..3e3f6f0 100644
--- a/libempathy-gtk/.gitignore
+++ b/libempathy-gtk/.gitignore
@@ -1,3 +1,2 @@
-empathy-account-widgets-resources.[ch]
 empathy-gtk-marshal.*
 *.gladep
diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am
index 72c27b4..3605eea 100644
--- a/libempathy-gtk/Makefile.am
+++ b/libempathy-gtk/Makefile.am
@@ -4,6 +4,7 @@ include $(top_srcdir)/tools/flymake.mk
 
 AM_CPPFLAGS =                                           \
        $(ERROR_CFLAGS)                                 \
+       -I$(top_srcdir)/tp-account-widgets              \
        -I$(top_srcdir)/libempathy                      \
        -I$(top_srcdir)/extensions                      \
        -DDATADIR=\""$(datadir)"\"                      \
@@ -22,18 +23,12 @@ AM_CPPFLAGS =                                           \
        $(DISABLE_DEPRECATED)
 
 BUILT_SOURCES =                                        \
-       empathy-account-widgets-resources.c             \
-       empathy-account-widgets-resources.h             \
        empathy-gtk-enum-types.h                        \
        empathy-gtk-enum-types.c
 
 libempathy_gtk_handwritten_source =                    \
        empathy-account-chooser.c               \
        empathy-account-selector-dialog.c               \
-       empathy-account-widget-irc.c            \
-       empathy-account-widget-private.h        \
-       empathy-account-widget-sip.c            \
-       empathy-account-widget.c                \
        empathy-avatar-chooser.c                \
        empathy-avatar-image.c                  \
        empathy-bad-password-dialog.c           \
@@ -64,9 +59,6 @@ libempathy_gtk_handwritten_source =                   \
        empathy-individual-view.c               \
        empathy-individual-widget.c             \
        empathy-input-text-view.c               \
-       empathy-irc-network-chooser.c \
-       empathy-irc-network-chooser-dialog.c \
-       empathy-irc-network-dialog.c            \
        empathy-local-xmpp-assistant-widget.c \
        empathy-log-window.c                    \
        empathy-new-account-dialog.c            \
@@ -102,9 +94,6 @@ libempathy_gtk_handwritten_source =                  \
 libempathy_gtk_headers =                       \
        empathy-account-chooser.h               \
        empathy-account-selector-dialog.h               \
-       empathy-account-widget-irc.h            \
-       empathy-account-widget-sip.h            \
-       empathy-account-widget.h                \
        empathy-avatar-chooser.h                \
        empathy-avatar-image.h                  \
        empathy-bad-password-dialog.h           \
@@ -136,9 +125,6 @@ libempathy_gtk_headers =                    \
        empathy-individual-view.h               \
        empathy-individual-widget.h             \
        empathy-input-text-view.h               \
-       empathy-irc-network-chooser.h \
-       empathy-irc-network-chooser-dialog.h \
-       empathy-irc-network-dialog.h            \
        empathy-local-xmpp-assistant-widget.h \
        empathy-log-window.h                    \
        empathy-new-account-dialog.h            \
@@ -183,7 +169,7 @@ libempathy_gtk_la_LDFLAGS = \
 libempathy_gtk_la_SOURCES =                    \
        $(libempathy_gtk_handwritten_source)    \
        $(libempathy_gtk_headers)               \
-       totem-subtitle-encoding.c totem-subtitle-encoding.h
+       $(NULL)
 
 # do not distribute generated files
 nodist_libempathy_gtk_la_SOURCES =\
@@ -202,6 +188,7 @@ libempathy_gtk_la_LIBADD =                  \
        $(GCR_LIBS)                             \
        $(MEEGO_LIBS)                           \
        $(CHEESE_LIBS)                          \
+       $(top_builddir)/tp-account-widgets/libtp-account-widgets.la \
        $(top_builddir)/libempathy-gtk/egg-list-box/libegglistbox.la \
        $(top_builddir)/libempathy/libempathy.la
 
@@ -272,17 +259,7 @@ empathy-gtk-enum-types.c: Makefile $(libempathy_gtk_headers)
        && cp xgen-gtc $(@F) \
        && rm -f xgen-gtc
 
-account_widgets_resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies 
--sourcedir=$(srcdir) $(srcdir)/empathy-account-widgets.gresource.xml)
-
-empathy-account-widgets-resources.c: empathy-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)
-       $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-header $<
-
 EXTRA_DIST =                                   \
-       empathy-account-widgets.gresource.xml   \
-       $(account_widgets_ui_files)             \
        $(ui_DATA)
 
 if HAVE_GEOCLUE
diff --git a/src/Makefile.am b/src/Makefile.am
index db30af3..fdc9584 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,6 +3,7 @@ include $(top_srcdir)/tools/flymake.mk
 CPPFLAGS_COMMON =                                      \
        $(EMPATHY_CFLAGS)                               \
        $(ERROR_CFLAGS)                                 \
+       -I$(top_srcdir)/tp-account-widgets              \
        -I$(top_srcdir)/libempathy-gtk                  \
        -I$(top_srcdir)/libempathy                      \
        -I$(top_srcdir)/extensions                      \
@@ -22,6 +23,7 @@ AM_CPPFLAGS =                                         \
        $(NULL)
 
 LDADD =                                                                \
+       $(top_builddir)/tp-account-widgets/libtp-account-widgets.la \
        $(top_builddir)/libempathy-gtk/libempathy-gtk.la        \
        $(top_builddir)/libempathy/libempathy.la                \
        $(top_builddir)/extensions/libemp-extensions.la         \
diff --git a/tp-account-widgets/.gitignore b/tp-account-widgets/.gitignore
new file mode 100644
index 0000000..3c37f3d
--- /dev/null
+++ b/tp-account-widgets/.gitignore
@@ -0,0 +1 @@
+empathy-account-widgets-resources.[ch]
diff --git a/tp-account-widgets/Makefile.am b/tp-account-widgets/Makefile.am
new file mode 100644
index 0000000..c3a23a0
--- /dev/null
+++ b/tp-account-widgets/Makefile.am
@@ -0,0 +1,94 @@
+include $(top_srcdir)/tools/flymake.mk
+
+AM_CPPFLAGS =                                           \
+       $(ERROR_CFLAGS)                                 \
+       -I$(top_srcdir)/libempathy                      \
+       -I$(top_srcdir)/libempathy-gtk                  \
+       -DDATADIR=\""$(datadir)"\"                      \
+       -DPKGDATADIR=\""$(pkgdatadir)"\"                \
+       -DG_LOG_DOMAIN=\"empathy\"                      \
+       -DGCR_API_SUBJECT_TO_CHANGE                     \
+       $(EMPATHY_CFLAGS)                               \
+       $(WARN_CFLAGS)                                  \
+       $(DISABLE_DEPRECATED)
+
+BUILT_SOURCES =                                        \
+       empathy-account-widgets-resources.c             \
+       empathy-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            \
+       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            \
+       totem-subtitle-encoding.h               \
+       $(NULL)
+
+pkglib_LTLIBRARIES = libtp-account-widgets.la
+
+# libtp-account-widgets's API is not stable and will never be, so use -release to make the
+# SONAME of the plugin library change with every Empathy release.
+libtp_account_widgets_la_LDFLAGS = \
+   -no-undefined \
+   -release $(VERSION) \
+   $(NULL)
+
+libtp_account_widgets_la_SOURCES =                     \
+       $(libtp_account_widgets_sources)                \
+       $(libtp_account_widgets_headers)                \
+       $(NULL)
+
+# do not distribute generated files
+nodist_libtp_account_widgets_la_SOURCES = \
+       $(BUILT_SOURCES)
+
+check_c_sources = \
+    $(libtp_account_widgets_sources) \
+    $(libtp_account_widgets_headers) \
+    $(NULL)
+include $(top_srcdir)/tools/check-coding-style.mk
+check-local: check-coding-style
+
+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           \
+       $(NULL)
+
+account_widgets_resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies 
--sourcedir=$(srcdir) $(srcdir)/empathy-account-widgets.gresource.xml)
+
+empathy-account-widgets-resources.c: empathy-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)
+       $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-header $<
+
+EXTRA_DIST =                                   \
+       empathy-account-widgets.gresource.xml   \
+       $(account_widgets_ui_files)             \
+       $(NULL)
+
+CLEANFILES =                           \
+       $(BUILT_SOURCES)                \
+       $(NULL)
diff --git a/libempathy-gtk/empathy-account-widget-aim.ui b/tp-account-widgets/empathy-account-widget-aim.ui
similarity index 100%
rename from libempathy-gtk/empathy-account-widget-aim.ui
rename to tp-account-widgets/empathy-account-widget-aim.ui
diff --git a/libempathy-gtk/empathy-account-widget-generic.ui 
b/tp-account-widgets/empathy-account-widget-generic.ui
similarity index 100%
rename from libempathy-gtk/empathy-account-widget-generic.ui
rename to tp-account-widgets/empathy-account-widget-generic.ui
diff --git a/libempathy-gtk/empathy-account-widget-groupwise.ui 
b/tp-account-widgets/empathy-account-widget-groupwise.ui
similarity index 100%
rename from libempathy-gtk/empathy-account-widget-groupwise.ui
rename to tp-account-widgets/empathy-account-widget-groupwise.ui
diff --git a/libempathy-gtk/empathy-account-widget-icq.ui b/tp-account-widgets/empathy-account-widget-icq.ui
similarity index 100%
rename from libempathy-gtk/empathy-account-widget-icq.ui
rename to tp-account-widgets/empathy-account-widget-icq.ui
diff --git a/libempathy-gtk/empathy-account-widget-irc.c b/tp-account-widgets/empathy-account-widget-irc.c
similarity index 100%
rename from libempathy-gtk/empathy-account-widget-irc.c
rename to tp-account-widgets/empathy-account-widget-irc.c
diff --git a/libempathy-gtk/empathy-account-widget-irc.h b/tp-account-widgets/empathy-account-widget-irc.h
similarity index 100%
rename from libempathy-gtk/empathy-account-widget-irc.h
rename to tp-account-widgets/empathy-account-widget-irc.h
diff --git a/libempathy-gtk/empathy-account-widget-irc.ui b/tp-account-widgets/empathy-account-widget-irc.ui
similarity index 100%
rename from libempathy-gtk/empathy-account-widget-irc.ui
rename to tp-account-widgets/empathy-account-widget-irc.ui
diff --git a/libempathy-gtk/empathy-account-widget-jabber.ui 
b/tp-account-widgets/empathy-account-widget-jabber.ui
similarity index 100%
rename from libempathy-gtk/empathy-account-widget-jabber.ui
rename to tp-account-widgets/empathy-account-widget-jabber.ui
diff --git a/libempathy-gtk/empathy-account-widget-local-xmpp.ui 
b/tp-account-widgets/empathy-account-widget-local-xmpp.ui
similarity index 100%
rename from libempathy-gtk/empathy-account-widget-local-xmpp.ui
rename to tp-account-widgets/empathy-account-widget-local-xmpp.ui
diff --git a/libempathy-gtk/empathy-account-widget-msn.ui b/tp-account-widgets/empathy-account-widget-msn.ui
similarity index 100%
rename from libempathy-gtk/empathy-account-widget-msn.ui
rename to tp-account-widgets/empathy-account-widget-msn.ui
diff --git a/libempathy-gtk/empathy-account-widget-private.h 
b/tp-account-widgets/empathy-account-widget-private.h
similarity index 100%
rename from libempathy-gtk/empathy-account-widget-private.h
rename to tp-account-widgets/empathy-account-widget-private.h
diff --git a/libempathy-gtk/empathy-account-widget-sip.c b/tp-account-widgets/empathy-account-widget-sip.c
similarity index 100%
rename from libempathy-gtk/empathy-account-widget-sip.c
rename to tp-account-widgets/empathy-account-widget-sip.c
diff --git a/libempathy-gtk/empathy-account-widget-sip.h b/tp-account-widgets/empathy-account-widget-sip.h
similarity index 100%
rename from libempathy-gtk/empathy-account-widget-sip.h
rename to tp-account-widgets/empathy-account-widget-sip.h
diff --git a/libempathy-gtk/empathy-account-widget-sip.ui b/tp-account-widgets/empathy-account-widget-sip.ui
similarity index 100%
rename from libempathy-gtk/empathy-account-widget-sip.ui
rename to tp-account-widgets/empathy-account-widget-sip.ui
diff --git a/libempathy-gtk/empathy-account-widget-yahoo.ui 
b/tp-account-widgets/empathy-account-widget-yahoo.ui
similarity index 100%
rename from libempathy-gtk/empathy-account-widget-yahoo.ui
rename to tp-account-widgets/empathy-account-widget-yahoo.ui
diff --git a/libempathy-gtk/empathy-account-widget.c b/tp-account-widgets/empathy-account-widget.c
similarity index 100%
rename from libempathy-gtk/empathy-account-widget.c
rename to tp-account-widgets/empathy-account-widget.c
diff --git a/libempathy-gtk/empathy-account-widget.h b/tp-account-widgets/empathy-account-widget.h
similarity index 100%
rename from libempathy-gtk/empathy-account-widget.h
rename to tp-account-widgets/empathy-account-widget.h
diff --git a/libempathy-gtk/empathy-account-widgets.gresource.xml 
b/tp-account-widgets/empathy-account-widgets.gresource.xml
similarity index 100%
rename from libempathy-gtk/empathy-account-widgets.gresource.xml
rename to tp-account-widgets/empathy-account-widgets.gresource.xml
diff --git a/libempathy-gtk/empathy-irc-network-chooser-dialog.c 
b/tp-account-widgets/empathy-irc-network-chooser-dialog.c
similarity index 100%
rename from libempathy-gtk/empathy-irc-network-chooser-dialog.c
rename to tp-account-widgets/empathy-irc-network-chooser-dialog.c
diff --git a/libempathy-gtk/empathy-irc-network-chooser-dialog.h 
b/tp-account-widgets/empathy-irc-network-chooser-dialog.h
similarity index 100%
rename from libempathy-gtk/empathy-irc-network-chooser-dialog.h
rename to tp-account-widgets/empathy-irc-network-chooser-dialog.h
diff --git a/libempathy-gtk/empathy-irc-network-chooser.c b/tp-account-widgets/empathy-irc-network-chooser.c
similarity index 100%
rename from libempathy-gtk/empathy-irc-network-chooser.c
rename to tp-account-widgets/empathy-irc-network-chooser.c
diff --git a/libempathy-gtk/empathy-irc-network-chooser.h b/tp-account-widgets/empathy-irc-network-chooser.h
similarity index 100%
rename from libempathy-gtk/empathy-irc-network-chooser.h
rename to tp-account-widgets/empathy-irc-network-chooser.h
diff --git a/libempathy-gtk/empathy-irc-network-dialog.c b/tp-account-widgets/empathy-irc-network-dialog.c
similarity index 100%
rename from libempathy-gtk/empathy-irc-network-dialog.c
rename to tp-account-widgets/empathy-irc-network-dialog.c
diff --git a/libempathy-gtk/empathy-irc-network-dialog.h b/tp-account-widgets/empathy-irc-network-dialog.h
similarity index 100%
rename from libempathy-gtk/empathy-irc-network-dialog.h
rename to tp-account-widgets/empathy-irc-network-dialog.h
diff --git a/libempathy-gtk/totem-subtitle-encoding.c b/tp-account-widgets/totem-subtitle-encoding.c
similarity index 100%
rename from libempathy-gtk/totem-subtitle-encoding.c
rename to tp-account-widgets/totem-subtitle-encoding.c
diff --git a/libempathy-gtk/totem-subtitle-encoding.h b/tp-account-widgets/totem-subtitle-encoding.h
similarity index 100%
rename from libempathy-gtk/totem-subtitle-encoding.h
rename to tp-account-widgets/totem-subtitle-encoding.h
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]