banshee r3383 - in trunk/banshee: . build po src/Clients/Nereid/Nereid src/Core/Banshee.Core/Resources src/Extensions/Banshee.Skins

[abock svn gnome org]

Author: abock
Date: Wed Mar  5 16:43:33 2008
New Revision: 3383
URL: http://svn.gnome.org/viewvc/banshee?rev=3383&view=rev

Log:
Fixed the build, more cleaning

Added:
   trunk/banshee/src/Core/Banshee.Core/Resources/translators.xml
Removed:
   trunk/banshee/src/Extensions/Banshee.Skins/
Modified:
   trunk/banshee/build/Makefile.am
   trunk/banshee/configure.ac
   trunk/banshee/po/ChangeLog
   trunk/banshee/po/POTFILES.in
   trunk/banshee/src/Clients/Nereid/Nereid/Client.cs
   trunk/banshee/src/Core/Banshee.Core/Resources/   (props changed)

Modified: trunk/banshee/build/Makefile.am
==============================================================================
--- trunk/banshee/build/Makefile.am	(original)
+++ trunk/banshee/build/Makefile.am	Wed Mar  5 16:43:33 2008
@@ -15,8 +15,10 @@
 	$(MCS) -out:$@ $<
 
 $(TRANSLATOR_EXTRACTOR_ASSEMBLY): TranslatorExtractor.cs
-	$(MCS) -out:$@ $< && $(MONO) $@ $(top_builddir)/po > \
-		$(top_builddir)/data/translators.xml
+	if [ "x$(top_srcdir)" = "x$(top_builddir)" ]; then \
+		$(MCS) -out:$@ $< && $(MONO) $@ $(top_builddir)/po > \
+			$(top_srcdir)/src/Core/Banshee.Core/Resources/translators.xml; \
+	fi;
 
 EXTRA_DIST = \
 	icon-theme-installer \

Modified: trunk/banshee/configure.ac
==============================================================================
--- trunk/banshee/configure.ac	(original)
+++ trunk/banshee/configure.ac	Wed Mar  5 16:43:33 2008
@@ -145,7 +145,6 @@
 src/Extensions/Banshee.MultimediaKeys/Makefile
 src/Extensions/Banshee.NotificationArea/Makefile
 src/Extensions/Banshee.PlayQueue/Makefile
-src/Extensions/Banshee.Skins/Makefile
 ])
 
 if test "x${enable_daap}" = "xyes"; then
@@ -156,7 +155,7 @@
 fi
 
 echo "
-banshee-$VERSION
+${PACKAGE}-${VERSION}
 
     Install Prefix:    ${prefix}
     Datadir:           ${expanded_datadir}
@@ -176,7 +175,7 @@
 #"
 
 if test -d ${expanded_libdir}/${PACKAGE}; then
-	echo "WARNING: An existing Banshee install is in ${expanded_libdir}/banshee"
+	echo "WARNING: An existing Banshee install is in ${expanded_libdir}/${PACKAGE}"
 	echo "         Remove the existing install before installing this build."
 	echo "         Installing over an existing install will cause conflicts!"
 	echo 

Modified: trunk/banshee/po/POTFILES.in
==============================================================================
--- trunk/banshee/po/POTFILES.in	(original)
+++ trunk/banshee/po/POTFILES.in	Wed Mar  5 16:43:33 2008
@@ -82,7 +82,6 @@
 src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs
 src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/X11NotificationAreaBox.cs
 src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs
-src/Extensions/Banshee.Skins/Banshee.Skins/SkinManager.cs
 src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Header.cs
 src/Libraries/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs
 src/Libraries/Hyena.Gui/Hyena.Gui.Dialogs/VersionInformationDialog.cs

Modified: trunk/banshee/src/Clients/Nereid/Nereid/Client.cs
==============================================================================
--- trunk/banshee/src/Clients/Nereid/Nereid/Client.cs	(original)
+++ trunk/banshee/src/Clients/Nereid/Nereid/Client.cs	Wed Mar  5 16:43:33 2008
@@ -36,13 +36,10 @@
         {
             // This could go into GtkBaseClient, but it's probably something we
             // should really only support at each client level
-            /*string user_gtkrc = Path.Combine (Banshee.Base.Paths.ApplicationData, "gtkrc"); 
-            
+            string user_gtkrc = Path.Combine (Banshee.Base.Paths.ApplicationData, "gtkrc"); 
             if (File.Exists (user_gtkrc)) {
                 Gtk.Rc.AddDefaultFile (user_gtkrc);
-            } else if (File.Exists ("gtkrc")) {
-                Gtk.Rc.AddDefaultFile ("gtkrc");
-            }*/
+            } 
             
             // Boot the client
             Banshee.Gui.GtkBaseClient.Entry<Client> ();

Added: trunk/banshee/src/Core/Banshee.Core/Resources/translators.xml
==============================================================================
--- (empty file)
+++ trunk/banshee/src/Core/Banshee.Core/Resources/translators.xml	Wed Mar  5 16:43:33 2008
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- AUTOGENERATED - DO NOT EDIT -->
+<translators>
+  <language code="ar" name="Arabic">
+    <person>Ahmad Farghal</person>
+    <person>Khaled Hosny</person>
+  </language>
+  <language code="be latin" name="i18n mova org">
+    <person>Ihar Hrachyshka</person>
+  </language>
+  <language code="bg" name="Bulgarian">
+    <person>Vladimir Petkov</person>
+    <person>Rostislav &quot;zbrox&quot; Raykov</person>
+  </language>
+  <language code="ca" name="Catalan">
+    <person>Jordi Mas i HernÃndez</person>
+  </language>
+  <language code="cs" name="Czech">
+    <person>LukÃÅ NovotnÃ</person>
+    <person>Jakub Friedl</person>
+  </language>
+  <language code="da" name="Danish">
+    <person>Lasse Bang Mikkelsen</person>
+  </language>
+  <language code="de" name="German">
+    <person>Jochen Skulj</person>
+    <person>Daniel Schindler</person>
+  </language>
+  <language code="dz" name="Dzongkha">
+    <person>yumkee lhamo</person>
+  </language>
+  <language code="en_CA" name="Canadian English">
+    <person>Adam Weinberger</person>
+  </language>
+  <language code="en_GB" name="English/GB">
+    <person>David Lodge</person>
+    <person>Christopher Orr</person>
+  </language>
+  <language code="es" name="Spanish">
+    <person>Maria Majadas</person>
+    <person>Jorge GonzÃlez</person>
+    <person>Francisco Javier F. Serrador</person>
+  </language>
+  <language code="fi" name="Finnish">
+    <person>Joonas Niilola</person>
+    <person>Ilkka Tuohela</person>
+  </language>
+  <language code="fr" name="French">
+    <person>Jonathan Ernst</person>
+    <person>StÃphane Raimbault</person>
+    <person>Florent Le Coz</person>
+    <person>Robert-Andrà Mauchin</person>
+  </language>
+  <language code="he" name="hebrew">
+    <person>Mark Krapivner</person>
+  </language>
+  <language code="hu" name="Hungarian">
+    <person>Gabor Kelemen</person>
+    <person>KÃmÃnczy KÃlmÃn</person>
+  </language>
+  <language code="it" name="Italian">
+    <person>Gianvito Cavasoli</person>
+    <person>Alessandro Gervaso</person>
+  </language>
+  <language code="ja" name="Japanese">
+    <person>Takeshi AIHANA</person>
+    <person>Koike Kazuhiko</person>
+  </language>
+  <language code="lt" name="Lithuanian">
+    <person>Gintautas Miliauskas</person>
+    <person>Åygimantas BeruÄka</person>
+  </language>
+  <language code="lv" name="Latvian">
+    <person>Raivis Dejus</person>
+  </language>
+  <language code="mk" name="Macedonian">
+    <person>Jovan Naumovski</person>
+  </language>
+  <language code="nb" name="Norwegian">
+    <person>Ãivind Hoel</person>
+    <person>Kjartan Maraas</person>
+  </language>
+  <language code="nl" name="Dutch">
+    <person>Pepijn van de Geer</person>
+    <person>Wouter Bolsterlee</person>
+    <person>Stijn Verslycken</person>
+  </language>
+  <language code="oc" name="Occitan">
+    <person>Yannig Marchegay (Kokoyaya)</person>
+  </language>
+  <language code="pa" name="Panjabi">
+    <person>A S Alam</person>
+  </language>
+  <language code="pl" name="Polish">
+    <person>Tomasz Dominikowski</person>
+  </language>
+  <language code="pt" name="Portuguese">
+    <person>Filipe Gomes</person>
+  </language>
+  <language code="pt_BR" name="Brazilian Portuguese">
+    <person>Marco Carvalho</person>
+    <person>Og Maciel</person>
+    <person>Evandro Fernandes Giovanini</person>
+    <person>Vladimir Melo</person>
+    <person>Daniel Abreu</person>
+  </language>
+  <language code="ru" name="Russian">
+    <person>Alexandre Prokoudine</person>
+  </language>
+  <language code="sl" name="Slovenian">
+    <person>Matej UrbanÄiÄ</person>
+  </language>
+  <language code="sr" name="Serbian">
+    <person>Goran RakiÄ</person>
+  </language>
+  <language code="sv" name="Swedish">
+    <person>Daniel Nylander</person>
+    <person>Christian Rose</person>
+  </language>
+  <language code="th" name="Thai">
+    <person>Theppitak Karoonboonyanan</person>
+    <person>Isriya Paireepairit</person>
+  </language>
+  <language code="vi" name="Vietnamese">
+    <person>Clytie Siddall</person>
+  </language>
+  <language code="zh_CN" name="Simplified Chinese">
+    <person>Funda Wang</person>
+  </language>
+  <language code="zh_HK" name="Chinese">
+    <person>Hsin-lin Cheng</person>
+  </language>
+  <language code="zh_TW" name="Chinese">
+    <person>Hsin-lin Cheng</person>
+  </language>
+</translators>