Index: cairo-dock/data/default-theme/launchers/01eog.desktop
===================================================================
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ cairo-dock/data/default-theme/launchers/01eog.desktop	2011-04-19 22:59:04.000000000 +0200
@@ -0,0 +1,54 @@
+#!en
+
+[Desktop Entry]
+#s Launcher's name :
+Name=Image Viewer
+#s Command to launch on click :
+#{Exemple : nautilus --no-desktop, gedit, etc. You can even enter a keyboard shortcut, for exemple <Alt>F1, <Ctrl>c,  <Ctrl>v, etc}
+Exec=eog %U
+#S Image's name or path :
+Icon=eog
+#d Name of the container it belongs to:
+#{If you write here a container's name that doesn't exist yet, a new one will be created, with this icon inside.}
+Container=Graphics
+
+#X[Extra parameters]
+frame_extra=
+#f[0;100] Order you want for this launcher among the others:
+Order=-1.6361083984375
+#b Prevent this launcher from stealing appli from taskbar ?
+#{If you choosed to mix launcher and applis, this option will deactivate this behaviour for this launcher only. It can be useful for instance for a launcher that launches a script in a terminal, but you don't want it to steal the Terminal's icon from the Taskbar.}
+prevent inhibate=false
+
+#K Class of the program :
+#{The only reason you may want to modify this parameter is if you made this launcher by hands. If you dropped it into the dock from the menu, it is nearly sure that you shouldn't touch it. It defines the class of the program, which is useful to link the appli with its launcher.}
+StartupWMClass=
+
+#b Run in a terminal ?
+#{It will use 'xterm'.}
+Terminal=false
+
+#i-[0;16] Only show in this specific viewport
+#{If '0' the launcher will be displayed on every viewport.}
+ShowOnViewport=0
+
+Nb subicons=0
+
+Renderer=
+
+Base URI=
+Is mounting point=false
+
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=EOG
+X-GNOME-Bugzilla-Component=general
+X-GNOME-Bugzilla-Version=2.32.1
+X-GNOME-DocPath=eog/eog.xml
+Comment=Browse and rotate images
+Type=Application
+Categories=GNOME;GTK;Graphics;RasterGraphics;Viewer;
+MimeType=image/bmp;image/gif;image/jpeg;image/jpg;image/pjpeg;image/png;image/tiff;image/x-bmp;image/x-gray;image/x-icb;image/x-ico;image/x-png;image/x-portable-anymap;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;image/x-xbitmap;image/x-xpixmap;image/x-pcx;image/svg+xml;image/svg+xml-compressed;image/vnd.wap.wbmp;
+TryExec=eog
+StartupNotify=true
+NoDisplay=true
+X-Ubuntu-Gettext-Domain=eog
Index: cairo-dock/data/default-theme/launchers/01evolution.desktop
===================================================================
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ cairo-dock/data/default-theme/launchers/01evolution.desktop	2011-04-19 22:59:04.000000000 +0200
@@ -0,0 +1,47 @@
+#!en
+
+[Desktop Entry]
+#s Launcher's name :
+Name=Evolution
+#s Command to launch on click :
+#{Exemple : nautilus --no-desktop, gedit, etc. You can even enter a keyboard shortcut, for exemple <Alt>F1 for the Applications Menu, <Ctrl>c or <Ctrl>v to copy or paste, etc}
+Exec=evolution %U
+#S Image's name or path :
+Icon=evolution
+#E[_MainDock_;Quimper, France;Blog;Documents;Vidéos]  Name of the container it belongs to:
+#{If you write here a container's name that doesn't exist yet, a new one will be created, with this icon inside.}
+Container=_MainDock_
+
+#X[Extra parameters]
+frame_extra=
+#f Order you want for this launcher among the others:
+Order=2.977783203125
+#b Prevent this launcher from stealing appli from taskbar ?
+#{Use this option for exemple if the launcher launches a script in a terminal but you don't want it to steal normal terminal's icons from the TaskBar, or if you explicitely want to use the original icon of the TaskBar because it provides some info, for exemple Pidgin's icons represent the avatar of the contact.}
+prevent inhibate=false
+
+#s Class of the program :
+#{The only reason you may want to modify this parameter is if you made this launcher by hands. If you dropped it into the dock from the menu, it is nearly sure that you shouldn't touch it. It defines the class of the program, which is useful to link the appli with its launcher.}
+StartupWMClass=
+
+Is container=false
+
+Renderer=
+
+Base URI=
+Is mounting point=false
+
+Comment=Manage your email, contacts and schedule
+GenericName=Groupware Suite
+X-GNOME-FullName=Evolution Mail and Calendar
+Terminal=false
+Type=Application
+Categories=GNOME;GTK;Office;Email;Calendar;ContactManagement;X-Red-Hat-Base;
+MimeType=text/calendar;text/x-vcard;text/directory;application/mbox;message/rfc822;x-scheme-handler/mailto
+StartupNotify=true
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=Evolution
+X-GNOME-Bugzilla-Component=BugBuddyBugs
+X-GNOME-Bugzilla-Version=2.32.x
+X-GNOME-Bugzilla-OtherBinaries=e-addressbook-factory;e-calendar-factory
+X-Ubuntu-Gettext-Domain=evolution-2.32
Index: cairo-dock/data/default-theme/launchers/01f-spot.desktop
===================================================================
--- cairo-dock.orig/data/default-theme/launchers/01f-spot.desktop	2011-04-19 22:58:37.817058474 +0200
+++ /dev/null	1970-01-01 00:00:00.000000000 +0000
@@ -1,53 +0,0 @@
-#!en
-
-[Desktop Entry]
-#s Launcher's name :
-Name=F-Spot
-#s Command to launch on click :
-#{Exemple : nautilus --no-desktop, gedit, etc. You can even enter a keyboard shortcut, for exemple <Alt>F1, <Ctrl>c,  <Ctrl>v, etc}
-Exec=f-spot
-#S Image's name or path :
-Icon=f-spot
-#d Name of the container it belongs to:
-#{If you write here a container's name that doesn't exist yet, a new one will be created, with this icon inside.}
-Container=Graphics
-
-#X[Extra parameters]
-frame_extra=
-#f[0;100] Order you want for this launcher among the others:
-Order=-0.6361083984375
-#b Prevent this launcher from stealing appli from taskbar ?
-#{If you choosed to mix launcher and applis, this option will deactivate this behaviour for this launcher only. It can be useful for instance for a launcher that launches a script in a terminal, but you don't want it to steal the Terminal's icon from the Taskbar.} 
-prevent inhibate=false
-
-#K Class of the program :
-#{The only reason you may want to modify this parameter is if you made this launcher by hands. If you dropped it into the dock from the menu, it is nearly sure that you shouldn't touch it. It defines the class of the program, which is useful to link the appli with its launcher.}
-StartupWMClass=
-
-#b Run in a terminal ?
-#{It will use 'xterm'.}
-Terminal=false
-
-#i-[0;16] Only show in this specific viewport
-#{If '0' the launcher will be displayed on every viewport.}
-ShowOnViewport=0
-
-Nb subicons=0
-
-Renderer=
-
-Base URI=
-Is mounting point=false
-
-Version=1.0
-GenericName=Photo Manager
-X-GNOME-FullName=F-Spot Photo Manager
-Comment=Organize, enjoy, and share your photos
-StartupNotify=true
-Type=Application
-Categories=Graphics;Photography;GNOME;GTK;
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=f-spot
-X-GNOME-Bugzilla-Component=General
-X-GNOME-Bugzilla-Version=0.6.1.5
-X-GNOME-DocPath=f-spot/f-spot.xml
Index: cairo-dock/data/default-theme/launchers/01inkscape.desktop
===================================================================
--- cairo-dock.orig/data/default-theme/launchers/01inkscape.desktop	2011-04-19 22:58:37.787058430 +0200
+++ /dev/null	1970-01-01 00:00:00.000000000 +0000
@@ -1,92 +0,0 @@
-#!en
-
-[Desktop Entry]
-#s Launcher's name :
-Name=Inkscape
-#s Command to launch on click :
-#{Exemple : nautilus --no-desktop, gedit, etc. You can even enter a keyboard shortcut, for exemple <Alt>F1, <Ctrl>c,  <Ctrl>v, etc}
-Exec=inkscape 
-#S Image's name or path :
-Icon=inkscape
-#d Name of the container it belongs to:
-#{If you write here a container's name that doesn't exist yet, a new one will be created, with this icon inside.}
-Container=Graphics
-
-#X[Extra parameters]
-frame_extra=
-#f[0;100] Order you want for this launcher among the others:
-Order=-1.6361083984375
-#b Prevent this launcher from stealing appli from taskbar ?
-#{If you choosed to mix launcher and applis, this option will deactivate this behaviour for this launcher only. It can be useful for instance for a launcher that launches a script in a terminal, but you don't want it to steal the Terminal's icon from the Taskbar.} 
-prevent inhibate=false
-
-#K Class of the program :
-#{The only reason you may want to modify this parameter is if you made this launcher by hands. If you dropped it into the dock from the menu, it is nearly sure that you shouldn't touch it. It defines the class of the program, which is useful to link the appli with its launcher.}
-StartupWMClass=
-
-#b Run in a terminal ?
-#{It will use 'xterm'.}
-Terminal=false
-
-#i-[0;16] Only show in this specific viewport
-#{If '0' the launcher will be displayed on every viewport.}
-ShowOnViewport=0
-
-Nb subicons=0
-
-Renderer=
-
-Base URI=
-Is mounting point=false
-
-Version=1.0
-GenericName=Vector Graphics Editor
-X-GNOME-FullName=Inkscape Vector Graphics Editor
-X-GNOME-FullName[ar]=إنكسكايب محرر الرسومات الشعاعية
-X-GNOME-FullName[be]=Рэдактар вэктарнай ґрафікі Inkscape
-X-GNOME-FullName[bg]=Inkscape илюстратор за векторна графика
-X-GNOME-FullName[br]=Inkscape Embanner kevregadoù sturiadel
-X-GNOME-FullName[ca]=Editor de gràfics vectorials Inkscape
-X-GNOME-FullName[cs]=Inkscape - editor vektorové grafiky
-X-GNOME-FullName[de]=Inkscape SVG-Vektorgrafik-Editor
-X-GNOME-FullName[en_GB]=Inkscape Vector Graphics Editor
-X-GNOME-FullName[en_US@piglatin]=Inkscape Ectorvay Aphicsgray Editorway
-X-GNOME-FullName[eo]=Inkscape: Ilustrilo por Vektoraj Bildoj
-X-GNOME-FullName[es]=Editor de gráficos vectoriales Inkscape
-X-GNOME-FullName[et]=Inkscape, vektorgraafika redaktor
-X-GNOME-FullName[eu]=Inkscape bektore-grafikoen editorea
-X-GNOME-FullName[fi]=Inkscape vektorigrafiikkatyökalu
-X-GNOME-FullName[fr]=Éditeur d'images vectorielles SVG Inkscape
-X-GNOME-FullName[gl]=Editor de imaxes vectoriais Inkscape
-X-GNOME-FullName[he]=אינקסקייפ עורך גרפיקה וקטורית
-X-GNOME-FullName[hr]=Inkscape - program za vektorsko crtanje
-X-GNOME-FullName[hu]=Inkscape - vektorgrafikai szerkesztő
-X-GNOME-FullName[hy]=Inkscape Վեկտորային Գրաֆիկայի Խմբագիր
-X-GNOME-FullName[it]=Inkscape - Grafica vettoriale SVG
-X-GNOME-FullName[ja]=Inkscape ベクターグラフィックエディタ
-X-GNOME-FullName[km]=កម្មវិធី​កែ​សម្រួល​ក្រាហ្វិក​វ៉ិចទ័រ Inkscape
-X-GNOME-FullName[ko]=Inkscape 벡터 그래픽 편집기
-X-GNOME-FullName[lt]=Inkscape vektorinės grafikos rengyklė
-X-GNOME-FullName[nb]=Inkscape vektor-tegneprogram
-X-GNOME-FullName[nl]=Inkscape SVG-vector-illustrator
-X-GNOME-FullName[pl]=Inkscape - edytor grafiki wektorowej
-X-GNOME-FullName[pt]=Inkscape Editor de Imagem Vectorial
-X-GNOME-FullName[pt_BR]=Editor de Imagens Vetoriais Inkscape
-X-GNOME-FullName[ro]=Inkscape editor de grafică vectorială
-X-GNOME-FullName[ru]=Редактор векторной графики Inkscape
-X-GNOME-FullName[sk]=Inkscape - editor vektorovej grafiky
-X-GNOME-FullName[sl]=Urejevalnik vektorskih slik Inkscape
-X-GNOME-FullName[sr]=Inkscape програм за векторско цртање
-X-GNOME-FullName[sr@latin]=Inkscape program za vektorsko crtanje
-X-GNOME-FullName[sv]=Vektorillustratören Inkscape
-X-GNOME-FullName[tr]=Inkscape Vektörel Grafik Düzenleyici
-X-GNOME-FullName[uk]=Редактор векторної графіки Inkscape
-X-GNOME-FullName[vi]=Inkscape - Trình Xử lý Ảnh Véc-tơ
-X-GNOME-FullName[zh_CN]=Inkscape矢量绘图软件
-X-GNOME-FullName[zh_TW]=Inkscape 向量繪圖軟體
-Comment=Create and edit Scalable Vector Graphics images
-Type=Application
-Categories=Graphics;VectorGraphics;GTK;
-MimeType=image/svg+xml;image/svg+xml-compressed;
-TryExec=inkscape
-StartupNotify=true
Index: cairo-dock/data/default-theme/launchers/CMakeLists.txt
===================================================================
--- cairo-dock.orig/data/default-theme/launchers/CMakeLists.txt	2011-04-19 22:58:37.707058307 +0200
+++ cairo-dock/data/default-theme/launchers/CMakeLists.txt	2011-04-19 22:59:04.000000000 +0200
@@ -8,10 +8,10 @@
 	01gimp.desktop
 	01firefox.desktop
 	01gnome-terminal.desktop
-	01f-spot.desktop
-	01inkscape.desktop
+	01shotwell.desktop
+	01eog.desktop
 	01separator.desktop
-	01thunderbird.desktop
+	01evolution.desktop
 	02separator.desktop
 	03separator.desktop
 	DESTINATION ${pkgdatadir}/themes/_default_/launchers)
Index: cairo-dock/data/default-theme/plug-ins/GMenu/GMenu.conf
===================================================================
--- cairo-dock.orig/data/default-theme/plug-ins/GMenu/GMenu.conf	2011-04-19 22:58:37.907058606 +0200
+++ cairo-dock/data/default-theme/plug-ins/GMenu/GMenu.conf	2011-04-19 22:59:04.000000000 +0200
@@ -17,7 +17,7 @@
 
 #S+ Image filename:
 #{Leave empty to use the default one.}
-icon=alacarte
+icon=distributor-logo
 
 #j+[0;128] Desired icon size for this applet
 #{Set to 0 to use the default applet size}
Index: cairo-dock/data/default-theme/plug-ins/musicPlayer/musicPlayer.conf
===================================================================
--- cairo-dock.orig/data/default-theme/plug-ins/musicPlayer/musicPlayer.conf	2011-04-19 22:58:37.867058541 +0200
+++ cairo-dock/data/default-theme/plug-ins/musicPlayer/musicPlayer.conf	2011-04-19 22:59:04.000000000 +0200
@@ -107,7 +107,7 @@
 #F[Audio Player;gtk-cdrom]
 frame_player=
 #L[Amarok 2;Audacious;Banshee;Clementine;Exaile;Exaile 0.3;GMusicBrowser;Guayadeque;Listen;Qmmp;QuodLibet;Rhythmbox;Songbird;XMMS 2;XMMS] Player to control:
-current-player=Rhythmbox
+current-player=Banshee
 
 #b Steal the player's icon from the taskbar?
 #{This will prevent the player icon appearing in the taskbar. The applet's icon will then behave as a launcher, an application and an applet.}
Index: cairo-dock/data/default-theme/launchers/01shotwell.desktop
===================================================================
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ cairo-dock/data/default-theme/launchers/01shotwell.desktop	2011-04-19 22:59:04.000000000 +0200
@@ -0,0 +1,52 @@
+#!en
+
+[Desktop Entry]
+#s Launcher's name :
+Name=Shotwell
+#s Command to launch on click :
+#{Exemple : nautilus --no-desktop, gedit, etc. You can even enter a keyboard shortcut, for exemple <Alt>F1, <Ctrl>c,  <Ctrl>v, etc}
+Exec=shotwell %U
+#S Image's name or path :
+Icon=shotwell
+#d Name of the container it belongs to:
+#{If you write here a container's name that doesn't exist yet, a new one will be created, with this icon inside.}
+Container=Graphics
+
+#X[Extra parameters]
+frame_extra=
+#f[0;100] Order you want for this launcher among the others:
+Order=-0.6361083984375
+#b Prevent this launcher from stealing appli from taskbar ?
+#{If you choosed to mix launcher and applis, this option will deactivate this behaviour for this launcher only. It can be useful for instance for a launcher that launches a script in a terminal, but you don't want it to steal the Terminal's icon from the Taskbar.}
+prevent inhibate=false
+
+#K Class of the program :
+#{The only reason you may want to modify this parameter is if you made this launcher by hands. If you dropped it into the dock from the menu, it is nearly sure that you shouldn't touch it. It defines the class of the program, which is useful to link the appli with its launcher.}
+StartupWMClass=
+
+#b Run in a terminal ?
+#{It will use 'xterm'.}
+Terminal=false
+
+#i-[0;16] Only show in this specific viewport
+#{If '0' the launcher will be displayed on every viewport.}
+ShowOnViewport=0
+
+Nb subicons=0
+
+Renderer=
+
+Base URI=
+Is mounting point=false
+
+Version=1.0
+GenericName=Photo Manager
+X-GNOME-FullName=Shotwell Photo Manager
+Comment=Organize your photos
+Type=Application
+MimeType=x-content/image-dcf;
+Categories=Graphics;Photography;GNOME;GTK;
+X-GIO-NoFuse=true
+X-GNOME-Gettext-Domain=shotwell
+X-GNOME-FullName=Shotwell Photo Manager
+X-Ayatana-Appmenu-Show-Stubs=false
Index: cairo-dock/data/default-theme/launchers/01thunderbird.desktop
===================================================================
--- cairo-dock.orig/data/default-theme/launchers/01thunderbird.desktop	2011-04-19 22:58:37.757058386 +0200
+++ /dev/null	1970-01-01 00:00:00.000000000 +0000
@@ -1,58 +0,0 @@
-#!en
-
-[Desktop Entry]
-#s Launcher's name :
-Name=Mozilla Thunderbird Mail/News
-#s Command to launch on click :
-#{Exemple : nautilus --no-desktop, gedit, etc. You can even enter a keyboard shortcut, for exemple <Alt>F1 for the Applications Menu, <Ctrl>c or <Ctrl>v to copy or paste, etc}
-Exec=thunderbird 
-#S Image's name or path :
-Icon=thunderbird
-#E[_MainDock_;Quimper, France;Blog;Documents;Vidéos]  Name of the container it belongs to:
-#{If you write here a container's name that doesn't exist yet, a new one will be created, with this icon inside.}
-Container=_MainDock_
-
-#X[Extra parameters]
-frame_extra=
-#f Order you want for this launcher among the others:
-Order=2.977783203125
-#b Prevent this launcher from stealing appli from taskbar ?
-#{Use this option for exemple if the launcher launches a script in a terminal but you don't want it to steal normal terminal's icons from the TaskBar, or if you explicitely want to use the original icon of the TaskBar because it provides some info, for exemple Pidgin's icons represent the avatar of the contact.}
-prevent inhibate=false
-
-#s Class of the program :
-#{The only reason you may want to modify this parameter is if you made this launcher by hands. If you dropped it into the dock from the menu, it is nearly sure that you shouldn't touch it. It defines the class of the program, which is useful to link the appli with its launcher.}
-StartupWMClass=Thunderbird-bin
-
-Is container=false
-
-Renderer=
-
-Base URI=
-Is mounting point=false
-Encoding=UTF-8
-Comment=Read/Write Mail/News with Mozilla Thunderbird
-GenericName=Mail Client
-Terminal=false
-X-MultipleArgs=false
-Type=Application
-Categories=Application;Network;
-MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/vnd.mozilla.xul+xml;application/rss+xml;application/rdf+xml;image/gif;image/jpeg;image/png
-StartupNotify=true
-Name[cs]=Poštovní klient Thunderbird
-Name[ca]=Client de correu Thunderbird
-Name[fi]=Thunderbird-sähköposti
-Name[fr]=Thunderbird
-Name[pl]=Klient poczty Thunderbird
-Name[pt_BR]=Cliente de E-mail Thunderbird
-Name[sv]=E-postklienten Thunderbird
-Comment[ca]=Llegiu i escriviu correu
-Comment[cs]=Čtení a psaní pošty
-Comment[de]=Emails lesen und verfassen
-Comment[fi]=Lue ja kirjoita sähköposteja
-Comment[fr]=Lire et écrire des courriels
-Comment[it]=Leggere e scrivere email
-Comment[ja]=メールの読み書き
-Comment[pl]=Czytanie i wysyłanie e-maili
-Comment[pt_BR]=Ler e escrever suas mensagens
-Comment[sv]=Läs och skriv e-post
