rpms/gnotime/devel fix_drag_and_drop.diff, NONE, 1.1 gnotime.spec, 1.24, 1.25

[Toshio くらとみ (toshio)]

Author: toshio

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

Modified Files:
	gnotime.spec 
Added Files:
	fix_drag_and_drop.diff 
Log Message:
* Fri Dec 7 2007 Toshio Kuratomi <toshio at fedoraproject.org> - 2.2.3-2
- Fix for reordering projects via drag and drop.


fix_drag_and_drop.diff:

--- NEW FILE fix_drag_and_drop.diff ---
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;


Index: gnotime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnotime/devel/gnotime.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- gnotime.spec	29 Oct 2007 02:09:07 -0000	1.24
+++ gnotime.spec	8 Dec 2007 03:13:46 -0000	1.25
@@ -1,6 +1,6 @@
 Name:           gnotime
 Version:        2.2.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Tracks and reports time spent
 
 Group:          Applications/Productivity
@@ -11,6 +11,8 @@
 # This changes a Makefile.am just to fix permissions on a script.  Submitted
 # upstream but fixed in spec via chmod so we don't need automake.
 Patch1:         gnotime-install-scripts.patch
+# Patch from upstream to fix drag and drop of projects
+Patch2:         fix_drag_and_drop.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtkhtml3-devel
@@ -42,6 +44,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch2 -p1
 
 %build
 autoconf
@@ -111,6 +114,9 @@
 %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Fri Dec 7 2007 Toshio Kuratomi <toshio at fedoraproject.org> - 2.2.3-2
+- Fix for reordering projects via drag and drop.
+
 * Fri Oct 26 2007 Toshio Kuratomi <toshio at fedoraproject.org> - 2.2.3-1
 - Upstream bugfix release.