xmas-sucks.patch

   1 --- vlc-1.1.13/./modules/gui/qt4/dialogs/help.cpp~      2011-07-12 21:11:24.000000000 +0300
   2 +++ vlc-1.1.13/./modules/gui/qt4/dialogs/help.cpp       2011-12-23 14:17:53.190941666 +0200
   3 @@ -98,10 +98,7 @@
   4      QLabel *introduction = new QLabel(
   5              qtr( "VLC media player" ) + qfu( " " VERSION_MESSAGE ) );
   6      QLabel *iconVLC = new QLabel;
   7 -    if( QDate::currentDate().dayOfYear() >= 354 )
   8 -        iconVLC->setPixmap( QPixmap( ":/logo/vlc48-christmas.png" ) );
   9 -    else
  10 -        iconVLC->setPixmap( QPixmap( ":/logo/vlc48.png" ) );
  11 +       iconVLC->setPixmap( QPixmap( ":/logo/vlc48.png" ) );
  12      layout->addWidget( iconVLC, 0, 0, 1, 1 );
  13      layout->addWidget( introduction, 0, 1, 1, 7 );
  14      layout->addWidget( tab, 1, 0, 1, 8 );
  15 @@ -127,10 +124,7 @@
  16      infoLabel->setWordWrap( infoLabel );
  17
  18      QLabel *iconVLC2 = new QLabel;
  19 -    if( QDate::currentDate().dayOfYear() >= 354 )
  20 -        iconVLC2->setPixmap( QPixmap( ":/logo/vlc128-christmas.png" ) );
  21 -    else
  22 -        iconVLC2->setPixmap( QPixmap( ":/logo/vlc128.png" ) );
  23 +       iconVLC2->setPixmap( QPixmap( ":/logo/vlc128.png" ) );
  24      infoLayout->addWidget( iconVLC2 );
  25      infoLayout->addWidget( infoLabel );
  26
  27 --- vlc-1.1.13/./modules/gui/qt4/qt4.cpp~       2011-07-12 21:11:24.000000000 +0300
  28 +++ vlc-1.1.13/./modules/gui/qt4/qt4.cpp        2011-12-23 14:18:13.438538931 +0200
  29 @@ -44,7 +44,6 @@
  30  #endif
  31
  32  #include "../../../share/icons/32x32/vlc.xpm"
  33 -#include "../../../share/icons/32x32/vlc-christmas.xpm"
  34  #include <vlc_plugin.h>
  35
  36  #ifdef WIN32 /* For static builds */
  37 @@ -425,10 +424,7 @@
  38              QSettings::UserScope, "vlc", "vlc-qt-interface" );
  39
  40      /* Icon setting */
  41 -    if( QDate::currentDate().dayOfYear() >= 352 ) /* One Week before Xmas */
  42 -        app.setWindowIcon( QIcon(vlc_christmas_xpm) );
  43 -    else
  44 -        app.setWindowIcon( QIcon(vlc_xpm) );
  45 +       app.setWindowIcon( QIcon(vlc_xpm) );
  46
  47      /* Initialize timers and the Dialog Provider */
  48      DialogsProvider::getInstance( p_intf );
  49 --- vlc-1.1.13/./modules/gui/qt4/components/interface_widgets.cpp~      2011-07-12 21:11:24.000000000 +0300
  50 +++ vlc-1.1.13/./modules/gui/qt4/components/interface_widgets.cpp       2011-12-23 14:18:42.366535155 +0200
  51 @@ -212,11 +212,8 @@
  52          pixmapUrl = url;
  53      }
  54      else
  55 -    {   /* Xmas joke */
  56 -        if( QDate::currentDate().dayOfYear() >= 354 )
  57 -            pixmapUrl = QString( ":/logo/vlc128-christmas.png" );
  58 -        else
  59 -            pixmapUrl = QString( ":/logo/vlc128.png" );
  60 +    {
  61 +               pixmapUrl = QString( ":/logo/vlc128.png" );
  62      }
  63      update();
  64  }
  65 --- vlc-1.1.13/./modules/gui/qt4/main_interface.cpp~    2011-07-12 21:11:24.000000000 +0300
  66 +++ vlc-1.1.13/./modules/gui/qt4/main_interface.cpp     2011-12-23 14:18:58.393938455 +0200
  67 @@ -920,10 +920,7 @@
  68  void MainInterface::createSystray()
  69  {
  70      QIcon iconVLC;
  71 -    if( QDate::currentDate().dayOfYear() >= 354 )
  72 -        iconVLC =  QIcon( ":/logo/vlc128-christmas.png" );
  73 -    else
  74 -        iconVLC =  QIcon( ":/logo/vlc128.png" );
  75 +       iconVLC =  QIcon( ":/logo/vlc128.png" );
  76      sysTray = new QSystemTrayIcon( iconVLC, this );
  77      sysTray->setToolTip( qtr( "VLC media player" ));
  78
  79 --- vlc-1.1.13/./share/Makefile.in~     2011-12-20 17:25:31.000000000 +0200
  80 +++ vlc-1.1.13/./share/Makefile.in      2011-12-23 14:19:28.315313669 +0200
  81 @@ -631,11 +631,10 @@
  82  dist_appdata_DATA = vlc.desktop
  83  dist_vlcdata_DATA = icons/vlc.ico
  84  dist_icons16_DATA = icons/16x16/vlc.png icons/16x16/vlc.xpm
  85 -dist_icons32_DATA = icons/32x32/vlc.png icons/32x32/vlc.xpm \
  86 -                   icons/32x32/vlc-christmas.xpm
  87 +dist_icons32_DATA = icons/32x32/vlc.png icons/32x32/vlc.xpm
  88
  89 -dist_icons48_DATA = icons/48x48/vlc.png icons/48x48/vlc-christmas.png
  90 -dist_icons128_DATA = icons/128x128/vlc.png icons/128x128/vlc-christmas.png
  91 +dist_icons48_DATA = icons/48x48/vlc.png
  92 +dist_icons128_DATA = icons/128x128/vlc.png
  93  dist_icons256_DATA = icons/256x256/vlc.png
  94  nobase_dist_vlcdata_SCRIPTS = \
  95         utils/gnome-vlc-default.sh \
  96 --- vlc-1.1.13/./share/Makefile.am~     2011-03-08 23:16:39.000000000 +0200
  97 +++ vlc-1.1.13/./share/Makefile.am      2011-12-23 14:20:06.617074051 +0200
  98 @@ -14,10 +14,9 @@
  99
 100  dist_vlcdata_DATA = icons/vlc.ico
 101  dist_icons16_DATA = icons/16x16/vlc.png icons/16x16/vlc.xpm
 102 -dist_icons32_DATA = icons/32x32/vlc.png icons/32x32/vlc.xpm \
 103 -                   icons/32x32/vlc-christmas.xpm
 104 -dist_icons48_DATA = icons/48x48/vlc.png icons/48x48/vlc-christmas.png
 105 -dist_icons128_DATA = icons/128x128/vlc.png icons/128x128/vlc-christmas.png
 106 +dist_icons32_DATA = icons/32x32/vlc.png icons/32x32/vlc.xpm
 107 +dist_icons48_DATA = icons/48x48/vlc.png
 108 +dist_icons128_DATA = icons/128x128/vlc.png
 109  dist_icons256_DATA = icons/256x256/vlc.png
 110
 111  nobase_dist_vlcdata_SCRIPTS = \
 112 --- vlc-1.1.13/./modules/gui/qt4/vlc.qrc~       2011-07-12 21:11:24.000000000 +0300
 113 +++ vlc-1.1.13/./modules/gui/qt4/vlc.qrc        2011-12-23 14:20:18.154270979 +0200
 114 @@ -3,8 +3,6 @@
 115          <file alias="vlc128.png" >../../../share/icons/128x128/vlc.png</file>
 116          <file alias="vlc16.png" >../../../share/icons/16x16/vlc.png</file>
 117          <file alias="vlc48.png" >../../../share/icons/48x48/vlc.png</file>
 118 -        <file alias="vlc128-christmas.png" >../../../share/icons/128x128/vlc-christmas.png</file>
 119 -        <file alias="vlc48-christmas.png" >../../../share/icons/48x48/vlc-christmas.png</file>
 120      </qresource>
 121      <qresource prefix="/menu" >
 122          <file alias="help" >pixmaps/menus/help_16px.png</file>