rpms/cairo-dock/devel cairo-dock-rev1455-compile.patch, NONE, 1.1 .cvsignore, 1.89, 1.90 cairo-dock.spec, 1.119, 1.120 sources, 1.89, 1.90

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/cairo-dock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14027

Modified Files:
	.cvsignore cairo-dock.spec sources 
Added Files:
	cairo-dock-rev1455-compile.patch 
Log Message:
rev 1455

cairo-dock-rev1455-compile.patch:

--- NEW FILE cairo-dock-rev1455-compile.patch ---
Index: plug-ins/musicPlayer/src/applet-struct.h
===================================================================
--- plug-ins/musicPlayer/src/applet-struct.h	(revision 1455)
+++ plug-ins/musicPlayer/src/applet-struct.h	(working copy)
@@ -104,7 +104,7 @@
 	gdouble fTimeDialogs;
 	gboolean bEnableCover;
 	gboolean bEnableAnim;
-	CairoDockAnimationType pChangeAnimation;
+	gchar *pChangeAnimation;
 	gchar *cMusicPlayer;
 	MyAppletQuickInfoType pQuickInfoType;
 	gchar *cDefaultTitle;
Index: plug-ins/musicPlayer/src/applet-config.c
===================================================================
--- plug-ins/musicPlayer/src/applet-config.c	(revision 1455)
+++ plug-ins/musicPlayer/src/applet-config.c	(working copy)
@@ -34,7 +34,7 @@
 	myConfig.fTimeDialogs 			= CD_CONFIG_GET_DOUBLE_WITH_DEFAULT ("Configuration", "time_dialogs", 3000);
 	
 	myConfig.bEnableAnim 				= CD_CONFIG_GET_BOOLEAN ("Configuration", "enable_anim");
-	myConfig.pChangeAnimation 	= CD_CONFIG_GET_ANIMATION_WITH_DEFAULT ("Configuration", "change_animation", CAIRO_DOCK_PULSE);
+	// myConfig.pChangeAnimation 	= CD_CONFIG_GET_ANIMATION_WITH_DEFAULT ("Configuration", "change_animation", CAIRO_DOCK_PULSE);
 	myConfig.bEnableCover				= CD_CONFIG_GET_BOOLEAN ("Configuration", "enable_cover");
 	myConfig.bStealTaskBarIcon 	= CD_CONFIG_GET_BOOLEAN ("Configuration", "inhibate appli");
 	myConfig.bIconBubble 				= CD_CONFIG_GET_BOOLEAN ("Configuration", "bubble icon");
Index: plug-ins/stacks/src/applet-load-icons.c
===================================================================
--- plug-ins/stacks/src/applet-load-icons.c	(revision 1455)
+++ plug-ins/stacks/src/applet-load-icons.c	(working copy)
@@ -319,7 +319,7 @@
 			Avec 10 j'ai juste la monté et je doit bougé la souris dans le sous dock pour que l'animation continue
 			L'openGL reglèrera surment ca.*/
 			/// oki je vois, effectivement sans acceleration materielle animer 20 icones ca devient limite.
-				cairo_dock_animate_icon (pAddedIcon, myIcon->pSubDock, CAIRO_DOCK_BOUNCE, 2);
+				//cairo_dock_animate_icon (pAddedIcon, myIcon->pSubDock, CAIRO_DOCK_BOUNCE, 2);
 			if (myData.iSidTimer != 0) {
 				g_source_remove (myData.iSidTimer);
 				myData.iSidTimer = 0;
@@ -351,7 +351,7 @@
 		if (myDock && pDeletedIcon != NULL) {
 			pDeletedIcon->cWorkingDirectory = NULL;
 			cairo_dock_show_subdock (myIcon, FALSE, myDock);
-			cairo_dock_animate_icon (pDeletedIcon, myIcon->pSubDock, CAIRO_DOCK_BLINK, 2);
+			// cairo_dock_animate_icon (pDeletedIcon, myIcon->pSubDock, CAIRO_DOCK_BLINK, 2);
 			//Il faut attendre que l'animation se termine pour virer l'icône du sous-dock - 1.5sec est-ce suffisant?
 			g_timeout_add (1500, (GSourceFunc) _on_animation_complete, (gpointer) pDeletedIcon);
 		}


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/.cvsignore,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- .cvsignore	29 Dec 2008 16:14:32 -0000	1.89
+++ .cvsignore	30 Dec 2008 03:49:33 -0000	1.90
@@ -1 +1 @@
-cairo-dock-sources-svn1454_trunk.tar.bz2
+cairo-dock-sources-svn1455_trunk.tar.bz2


Index: cairo-dock.spec
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- cairo-dock.spec	29 Dec 2008 16:14:32 -0000	1.119
+++ cairo-dock.spec	30 Dec 2008 03:49:33 -0000	1.120
@@ -11,7 +11,7 @@
 %undefine		betaver		
 %define		build_webkit	1
 %define		build_xfce	1
-%define		tarballver	svn1454_trunk
+%define		tarballver	svn1455_trunk
 
 %define		fedora_main_rel	3
 
@@ -47,7 +47,7 @@
 Source1:	http://download.berlios.de/cairo-dock/%{name}-themes-%{mainver}%{?betaver:-%betaver}.tar.bz2
 Source2:	http://download.berlios.de/cairo-dock/%{name}-plugins-%{mainver}%{?betaver:-%betaver}.tar.bz2
 %endif
-#Patch10:	cairo-dock-plugins-compile.patch
+Patch10:	cairo-dock-rev1455-compile.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	automake
@@ -221,6 +221,7 @@
 find . -name \*.h -or -name \*.c | xargs %{__chmod} 0644
 
 # source code fix	
+%patch0 -p1 -b .debug
 
 # Cairo-Penguin
 ## Need ask
@@ -637,7 +638,7 @@
 
 %changelog
 * Tue Dec 30 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- rev 1454
+- rev 1455
 
 * Thu Dec 25 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - rev 1451


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/sources,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- sources	29 Dec 2008 16:14:32 -0000	1.89
+++ sources	30 Dec 2008 03:49:33 -0000	1.90
@@ -1 +1 @@
-1fe9bd48a122078ef8d7c21a75fcf3c2  cairo-dock-sources-svn1454_trunk.tar.bz2
+a09a31c452dd2a3278da383f35d4ab49  cairo-dock-sources-svn1455_trunk.tar.bz2