Remove Christian references

Then again, many developers have Christian first names (most noticeably
"Christophe").

diff --git a/modules/gui/qt4/components/interface_widgets.cpp b/modules/gui/qt4/components/interface_widgets.cpp
index 084a89cd725ef240144585f52ed357205fa111e3..1a8deb52de24f171408dc388afa3e57d76d8d3a4 100644 (file)
--- a/modules/gui/qt4/components/interface_widgets.cpp
+++ b/modules/gui/qt4/components/interface_widgets.cpp
@@ -212,8 +212,8 @@ void BackgroundWidget::updateArt( const QString& url )
     }
     else
     {   /* Xmas joke */
-        if( QDate::currentDate().dayOfYear() >= QT_CHRISTMAS_TROLL_DAY )
-            pixmapUrl = QString( ":/logo/vlc128-christmas.png" );
+        if( QDate::currentDate().dayOfYear() >= QT_XMAS_JOKE_DAY )
+            pixmapUrl = QString( ":/logo/vlc128-xmas.png" );
         else
             pixmapUrl = QString( ":/logo/vlc128.png" );
     }

diff --git a/modules/gui/qt4/dialogs/help.cpp b/modules/gui/qt4/dialogs/help.cpp
index 76a631e79330f67b4c75c628247d0407f724f849..1c95350e2eb4485391f12b7e061c06370dcf0e9e 100644 (file)
--- a/modules/gui/qt4/dialogs/help.cpp
+++ b/modules/gui/qt4/dialogs/help.cpp
@@ -102,8 +102,8 @@ AboutDialog::AboutDialog( intf_thread_t *_p_intf)
     ui.introduction->setText(
             qtr( "VLC media player" ) + qfu( " " VERSION_MESSAGE ) );
 
-    if( QDate::currentDate().dayOfYear() >= QT_CHRISTMAS_TROLL_DAY )
-        ui.iconVLC->setPixmap( QPixmap( ":/logo/vlc128-christmas.png" ) );
+    if( QDate::currentDate().dayOfYear() >= QT_XMAS_JOKE_DAY )
+        ui.iconVLC->setPixmap( QPixmap( ":/logo/vlc128-xmas.png" ) );
     else
         ui.iconVLC->setPixmap( QPixmap( ":/logo/vlc128.png" ) );
 

diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index 139ce17f5566df66efd3080df411caf8f267a4fb..2931d4f5e8d071bf4bd96e9ce83c512de06ee4d7 100644 (file)
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -942,8 +942,8 @@ void MainInterface::showBuffering( float f_cache )
 void MainInterface::createSystray()
 {
     QIcon iconVLC;
-    if( QDate::currentDate().dayOfYear() >= QT_CHRISTMAS_TROLL_DAY )
-        iconVLC =  QIcon( ":/logo/vlc128-christmas.png" );
+    if( QDate::currentDate().dayOfYear() >= QT_XMAS_JOKE_DAY )
+        iconVLC =  QIcon( ":/logo/vlc128-xmas.png" );
     else
         iconVLC =  QIcon( ":/logo/vlc128.png" );
     sysTray = new QSystemTrayIcon( iconVLC, this );

diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index ecfb7691b34842ff06b2d95e10110c1a4918c12d..30c1f1e31afb1da89b14b379b7d394dc561a63b2 100644 (file)
--- a/modules/gui/qt4/qt4.cpp
+++ b/modules/gui/qt4/qt4.cpp
@@ -44,7 +44,7 @@
 #endif
 
 #include "../../../share/icons/32x32/vlc.xpm"
-#include "../../../share/icons/32x32/vlc-christmas.xpm"
+#include "../../../share/icons/32x32/vlc-xmas.xpm"
 #include <vlc_plugin.h>
 
 #ifdef WIN32 /* For static builds */
@@ -479,8 +479,8 @@ static void *Thread( void *obj )
 
     /* Icon setting, Mac uses icon from .icns */
 #ifndef Q_WS_MAC
-    if( QDate::currentDate().dayOfYear() >= QT_CHRISTMAS_TROLL_DAY )
-        app.setWindowIcon( QIcon(vlc_christmas_xpm) );
+    if( QDate::currentDate().dayOfYear() >= QT_XMAS_JOKE_DAY )
+        app.setWindowIcon( QIcon(vlc_xmas_xpm) );
     else
         app.setWindowIcon( QIcon(vlc_xpm) );
 #endif

diff --git a/modules/gui/qt4/qt4.hpp b/modules/gui/qt4/qt4.hpp
index 21f0a5676cf2bda0f8cbfcfdab4c2f83959687c6..918986e987197a4833550f78ff3bee505ad9c544 100644 (file)
--- a/modules/gui/qt4/qt4.hpp
+++ b/modules/gui/qt4/qt4.hpp
@@ -131,11 +131,9 @@ static inline QString QVLCUserDir( vlc_userdir_t type )
 }
 
 /* After this day of the year, the usual VLC cone is replaced by another cone
- * wearing a Santa hat.
- * Warning: can panic users (virus changed my icons!!), and cause religious
- * trolls (VLC is a supporter of catholicism!!)
- * Note, this icon doesn't represent an endorsment of Coca-Cola company
+ * wearing a Father Xmas hat.
+ * Note this icon doesn't represent an endorsment of Coca-Cola company.
  */
-#define QT_CHRISTMAS_TROLL_DAY 354
+#define QT_XMAS_JOKE_DAY 354
 
 #endif

diff --git a/modules/gui/qt4/vlc.qrc b/modules/gui/qt4/vlc.qrc
index d0a826cde69f01eb9310de9a71c0edfb179d23c3..91befcfc471fa3d7961c63674b059f3ec6f44d18 100644 (file)
--- a/modules/gui/qt4/vlc.qrc
+++ b/modules/gui/qt4/vlc.qrc
@@ -3,8 +3,8 @@
         <file alias="vlc128.png" >../../../share/icons/128x128/vlc.png</file>
         <file alias="vlc16.png" >../../../share/icons/16x16/vlc.png</file>
         <file alias="vlc48.png" >../../../share/icons/48x48/vlc.png</file>
-        <file alias="vlc128-christmas.png" >../../../share/icons/128x128/vlc-christmas.png</file>
-        <file alias="vlc48-christmas.png" >../../../share/icons/48x48/vlc-christmas.png</file>
+        <file alias="vlc128-xmas.png" >../../../share/icons/128x128/vlc-xmas.png</file>
+        <file alias="vlc48-xmas.png" >../../../share/icons/48x48/vlc-xmas.png</file>
     </qresource>
     <qresource prefix="/menu" >
         <file alias="help" >pixmaps/menus/help_16px.png</file>

diff --git a/share/Makefile.am b/share/Makefile.am
index b491900c35337b23603f44662614df5d45c041a4..4e63432f5aff7dd79fd878aa5b5be0e4abbd6a4f 100644 (file)
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -15,9 +15,9 @@ dist_appdata_DATA = vlc.desktop
 dist_vlcdata_DATA = icons/vlc.ico
 dist_icons16_DATA = icons/16x16/vlc.png icons/16x16/vlc.xpm
 dist_icons32_DATA = icons/32x32/vlc.png icons/32x32/vlc.xpm \
-                   icons/32x32/vlc-christmas.xpm
-dist_icons48_DATA = icons/48x48/vlc.png icons/48x48/vlc-christmas.png
-dist_icons128_DATA = icons/128x128/vlc.png icons/128x128/vlc-christmas.png
+                   icons/32x32/vlc-xmas.xpm
+dist_icons48_DATA = icons/48x48/vlc.png icons/48x48/vlc-xmas.png
+dist_icons128_DATA = icons/128x128/vlc.png icons/128x128/vlc-xmas.png
 dist_icons256_DATA = icons/256x256/vlc.png
 
 nobase_dist_vlcdata_SCRIPTS = \

diff --git a/share/icons/128x128/vlc-christmas.png b/share/icons/128x128/vlc-xmas.png
similarity index 100%
rename from share/icons/128x128/vlc-christmas.png
rename to share/icons/128x128/vlc-xmas.png

diff --git a/share/icons/32x32/vlc-christmas.xpm b/share/icons/32x32/vlc-xmas.xpm
similarity index 99%
rename from share/icons/32x32/vlc-christmas.xpm
rename to share/icons/32x32/vlc-xmas.xpm
index bf2a01b590b3103ac0bc3370329f4ed649e5d0ce..cc1dd4fe23ea10a96429752a44bcbd23616fff02 100644 (file)
--- a/share/icons/32x32/vlc-christmas.xpm
+++ b/share/icons/32x32/vlc-xmas.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char *vlc_christmas_xpm[] = {
+static const char *vlc_xmas_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 174 2",
 "   c #00AE00390021",

diff --git a/share/icons/48x48/vlc-christmas.png b/share/icons/48x48/vlc-xmas.png
similarity index 100%
rename from share/icons/48x48/vlc-christmas.png
rename to share/icons/48x48/vlc-xmas.png