rpms/gnotime/devel fix_drag_and_drop.diff, 1.1, 1.2 gnotime.spec, 1.25, 1.26

[Toshio くらとみ (toshio)]

Author: toshio

Update of /cvs/pkgs/rpms/gnotime/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32066

Modified Files:
	fix_drag_and_drop.diff gnotime.spec 
Log Message:
* Fri Dec 7 2007 Toshio Kuratomi <toshio at fedoraproject.org> - 2.2.3-3
- Upstream's fix needed some fuzz cleanups.
- Fix the desktop file's Icon definition.


fix_drag_and_drop.diff:

Index: fix_drag_and_drop.diff
===================================================================
RCS file: /cvs/pkgs/rpms/gnotime/devel/fix_drag_and_drop.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fix_drag_and_drop.diff	8 Dec 2007 03:13:46 -0000	1.1
+++ fix_drag_and_drop.diff	8 Dec 2007 07:13:30 -0000	1.2
@@ -1,37 +1,29 @@
-diff -urNad gnotime-2.2.3+timers~/src/ctree.c gnotime-2.2.3+timers/src/ctree.c
---- gnotime-2.2.3+timers~/src/ctree.c   2007-10-27 13:57:38.000000000 -0200
-+++ gnotime-2.2.3+timers/src/ctree.c    2007-12-04 22:56:02.000000000 -0200
-@@ -667,6 +667,8 @@
-         * from which we were cutted. */
-        ctree_update_label (ptw, old_parent);
- 
-+       ctree_setup (ptw, ptw->proj_list);
-+
-        ptw->source_ctree_node = NULL;
-        ptw->parent_ctree_node = NULL;
-        ptw->sibling_ctree_node = NULL;
-@@ -684,15 +686,23 @@
- 
-        if (!source_node) return FALSE;
- 
-+
-        if (!parent_pixmap->window)
-        {
-                gtk_widget_realize (parent_pixmap);
-                gtk_widget_realize (sibling_pixmap);
-        }
- 
-+
-        /* Record the values. We don't actually reparent anything
--        * until the drag has completed. */
--       ptw->source_ctree_node = source_node;
-+        * until the drag has completed.
-+        * Record the source_node only if it was not recorded before
-+        * to work around a bug in GtkCTree */
-+
-+       if (!ptw->source_ctree_node)
-+       {
-+               ptw->source_ctree_node = source_node;
-+       }
-        ptw->parent_ctree_node = new_parent;
-        ptw->sibling_ctree_node = new_sibling;
+diff -up gnotime-2.2.3/src/ctree.c.dnd gnotime-2.2.3/src/ctree.c
+--- gnotime-2.2.3/src/ctree.c.dnd	2007-12-07 20:06:11.000000000 -0800
++++ gnotime-2.2.3/src/ctree.c	2007-12-07 20:08:11.000000000 -0800
+@@ -662,6 +662,8 @@ drag_drop (GtkWidget *widget, GdkDragCon
+ 	 * from which we were cutted. */
+ 	ctree_update_label (ptw, old_parent);
+ 
++	ctree_setup (ptw, ptw->proj_list);
++
+ 	ptw->source_ctree_node = NULL;
+ 	ptw->parent_ctree_node = NULL;
+ 	ptw->sibling_ctree_node = NULL;
+@@ -686,8 +688,14 @@ ctree_drag (GtkCTree *ctree, GtkCTreeNod
+ 	}
+ 
+ 	/* Record the values. We don't actually reparent anything
+-	 * until the drag has completed. */
+-	ptw->source_ctree_node = source_node;
++	 * until the drag has completed.
++	 * Record the source_node only if it was not recorded before
++	 * to work around a bug in GtkCTree */
++
++	if (!ptw->source_ctree_node)
++	{
++	ptw->source_ctree_node = source_node;
++	}
+ 	ptw->parent_ctree_node = new_parent;
+ 	ptw->sibling_ctree_node = new_sibling;
+ 


Index: gnotime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnotime/devel/gnotime.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- gnotime.spec	8 Dec 2007 03:13:46 -0000	1.25
+++ gnotime.spec	8 Dec 2007 07:13:30 -0000	1.26
@@ -45,6 +45,7 @@
 %setup -q
 %patch0 -p1
 %patch2 -p1
+sed -i 's/\(Icon=.*\)\.png/\1/' gnotime.desktop.in
 
 %build
 autoconf
@@ -109,11 +110,16 @@
 %doc AUTHORS COPYING ChangeLog NEWS README TODO
 %attr(0755,root,root) %{_bindir}/*
 %{_datadir}/%{name}
+%{_datadir}/omf/*
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_mandir}/man[^3]/*
 %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Fri Dec 7 2007 Toshio Kuratomi <toshio at fedoraproject.org> - 2.2.3-3
+- Upstream's fix needed some fuzz cleanups.
+- Fix the desktop file's Icon definition.
+
 * Fri Dec 7 2007 Toshio Kuratomi <toshio at fedoraproject.org> - 2.2.3-2
 - Fix for reordering projects via drag and drop.