[gnome-online-accounts] panel: Move to gnome-control-center



commit 7db51c1acd85df0602e4b6660be7443070818cb7
Author: Bastien Nocera <hadess hadess net>
Date:   Fri Jun 24 14:27:49 2011 +0100

    panel: Move to gnome-control-center
    
    https://bugzilla.gnome.org/show_bug.cgi?id=653335

 configure.ac                         |    9 -
 data/Makefile.am                     |   17 -
 data/goa-prefs.desktop.in            |   13 -
 data/icons/16x16/Makefile.am         |   15 -
 data/icons/16x16/goa-account.png     |  Bin 846 -> 0 bytes
 data/icons/16x16/goa-panel.png       |  Bin 917 -> 0 bytes
 data/icons/22x22/Makefile.am         |   15 -
 data/icons/22x22/goa-account.png     |  Bin 1202 -> 0 bytes
 data/icons/22x22/goa-panel.png       |  Bin 1431 -> 0 bytes
 data/icons/24x24/Makefile.am         |   15 -
 data/icons/24x24/goa-account.png     |  Bin 1230 -> 0 bytes
 data/icons/24x24/goa-panel.png       |  Bin 1469 -> 0 bytes
 data/icons/256x256/Makefile.am       |   15 -
 data/icons/256x256/goa-account.png   |  Bin 25710 -> 0 bytes
 data/icons/256x256/goa-panel.png     |  Bin 42185 -> 0 bytes
 data/icons/32x32/Makefile.am         |   15 -
 data/icons/32x32/goa-account.png     |  Bin 1938 -> 0 bytes
 data/icons/32x32/goa-panel.png       |  Bin 2170 -> 0 bytes
 data/icons/48x48/Makefile.am         |   15 -
 data/icons/48x48/goa-account.png     |  Bin 3123 -> 0 bytes
 data/icons/48x48/goa-panel.png       |  Bin 3747 -> 0 bytes
 data/icons/Makefile.am               |   18 -
 data/icons/scalable/Makefile.am      |   13 -
 po/POTFILES.in                       |    3 -
 src/Makefile.am                      |    2 +-
 src/panel/Makefile.am                |   51 ---
 src/panel/cc-online-accounts-model.c |  436 -----------------------
 src/panel/cc-online-accounts-model.h |   58 ---
 src/panel/cc-online-accounts-panel.c |  637 ----------------------------------
 src/panel/cc-online-accounts-panel.h |   40 ---
 30 files changed, 1 insertions(+), 1386 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index c65e18d..50979f3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -180,21 +180,12 @@ AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[gettext domain])
 AC_OUTPUT([
 Makefile
 data/Makefile
-data/icons/Makefile
-data/icons/16x16/Makefile
-data/icons/22x22/Makefile
-data/icons/24x24/Makefile
-data/icons/32x32/Makefile
-data/icons/48x48/Makefile
-data/icons/256x256/Makefile
-data/icons/scalable/Makefile
 src/Makefile
 src/goa/Makefile
 src/goa/goa-1.0.pc
 src/goabackend/Makefile
 src/goabackend/goa-backend-1.0.pc
 src/daemon/Makefile
-src/panel/Makefile
 src/examples/Makefile
 po/Makefile.in
 doc/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index f8790ce..5a6f44a 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,16 +1,6 @@
 
-SUBDIRS = icons
-
 NULL =
 
-desktopdir = $(datadir)/applications
-desktop_in_files =					\
-	goa-prefs.desktop.in				\
-	$(NULL)
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-
- INTLTOOL_DESKTOP_RULE@
-
 servicedir       = $(datadir)/dbus-1/services
 service_in_files = org.gnome.OnlineAccounts.service.in
 service_DATA     = $(service_in_files:.service.in=.service)
@@ -18,20 +8,13 @@ service_DATA     = $(service_in_files:.service.in=.service)
 $(service_DATA): $(service_in_files) Makefile
 	@sed -e "s|\ libexecdir\@|$(libexecdir)|" $< > $@
 
-pkgdata_DATA =						\
-	goapanel.ui					\
-	$(NULL)
-
 EXTRA_DIST =						\
-	$(desktop_in_files)				\
 	$(service_in_files)				\
-	$(pkgdata_DATA)					\
 	dbus-interfaces.xml				\
 	$(NULL)
 
 DISTCLEANFILES =					\
 	org.gnome.OnlineAccounts.service		\
-	goa-prefs.desktop				\
 	$(NULL)
 
 clean-local :
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 9a48cb8..2ccc9d7 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,8 +1,6 @@
 [encoding: UTF-8]
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
-data/goa-prefs.desktop.in
-data/goapanel.ui
 src/daemon/goadaemon.c
 src/goabackend/goafacebookprovider.c
 src/goabackend/goagoogleprovider.c
@@ -11,4 +9,3 @@ src/goabackend/goaoauthprovider.c
 src/goabackend/goaprovider.c
 src/goabackend/goatwitterprovider.c
 src/goabackend/goayahooprovider.c
-src/panel/goapanel.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 93685e6..bda8d46 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
 
 NULL =
 
-SUBDIRS = goa goabackend daemon panel examples
+SUBDIRS = goa goabackend daemon examples
 
 -include $(top_srcdir)/git.mk



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]