[planner] latest version
Caolán McNamara
caolanm at fedoraproject.org
Fri Mar 9 11:42:18 UTC 2012
commit 9e71dac26164e1f8c819b162db98dfd56617aeb5
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Mar 9 11:42:14 2012 +0000
latest version
.gitignore | 2 +-
planner-gnome341504-paste.tasks.patch | 34 ++++++++++++-------------
planner-gnome606824-notecolumn.patch | 6 ++--
planner-gnome615641-multiselect.patch | 43 +++++++++++++--------------------
planner.spec | 9 ++++--
sources | 2 +-
6 files changed, 44 insertions(+), 52 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9661503..20b9f53 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/planner-0.14.5.tar.bz2
+/planner-0.14.6.tar.xz
diff --git a/planner-gnome341504-paste.tasks.patch b/planner-gnome341504-paste.tasks.patch
index 1eb8732..13cfb8a 100644
--- a/planner-gnome341504-paste.tasks.patch
+++ b/planner-gnome341504-paste.tasks.patch
@@ -36,7 +36,7 @@ diff -ru planner-0.14.4.orig/src/planner-task-tree.c planner-0.14.4/src/planner-
static GtkTreeViewClass *parent_class = NULL;
-@@ -565,16 +579,17 @@
+@@ -554,16 +568,17 @@
}
static PlannerCmd *
@@ -57,7 +57,7 @@ diff -ru planner-0.14.4.orig/src/planner-task-tree.c planner-0.14.4/src/planner-
task_cmd_remove_do,
task_cmd_remove_undo,
task_cmd_remove_free);
-@@ -1016,6 +1031,7 @@
+@@ -1005,6 +1020,7 @@
task_tree_class_init (PlannerTaskTreeClass *klass)
{
GObjectClass *o_class;
@@ -65,7 +65,7 @@ diff -ru planner-0.14.4.orig/src/planner-task-tree.c planner-0.14.4/src/planner-
parent_class = g_type_class_peek_parent (klass);
-@@ -1048,6 +1064,54 @@
+@@ -1037,6 +1053,54 @@
planner_marshal_VOID__OBJECT_OBJECT,
G_TYPE_NONE,
2, MRP_TYPE_TASK, MRP_TYPE_RELATION);
@@ -120,7 +120,7 @@ diff -ru planner-0.14.4.orig/src/planner-task-tree.c planner-0.14.4/src/planner-
}
static void
-@@ -1076,6 +1140,14 @@
+@@ -1065,6 +1129,14 @@
}
static void
@@ -135,7 +135,7 @@ diff -ru planner-0.14.4.orig/src/planner-task-tree.c planner-0.14.4/src/planner-
task_tree_finalize (GObject *object)
{
PlannerTaskTree *tree;
-@@ -1084,6 +1156,9 @@
+@@ -1073,6 +1145,9 @@
tree = PLANNER_TASK_TREE (object);
priv = tree->priv;
@@ -145,7 +145,7 @@ diff -ru planner-0.14.4.orig/src/planner-task-tree.c planner-0.14.4/src/planner-
g_hash_table_destroy (priv->property_to_column);
planner_task_tree_set_anchor (tree, NULL);
-@@ -2758,77 +2833,71 @@
+@@ -2739,76 +2814,71 @@
g_list_free (list);
}
@@ -163,7 +163,6 @@ diff -ru planner-0.14.4.orig/src/planner-task-tree.c planner-0.14.4/src/planner-
- gint work;
- gint position;
gint depth;
-- PlannerCmd *cmd;
priv = tree->priv;
@@ -219,9 +218,8 @@ diff -ru planner-0.14.4.orig/src/planner-task-tree.c planner-0.14.4/src/planner-
- mrp_project_get_calendar (priv->project),
- mrp_day_get_work ());
-
-- depth = gtk_tree_path_get_depth (path);
+ depth = gtk_tree_path_get_depth (path);
- position = gtk_tree_path_get_indices (path)[depth - 1];
-+ depth = gtk_tree_path_get_depth (*path);
+ *position = gtk_tree_path_get_indices (*path)[depth - 1];
if (depth > 1) {
@@ -241,8 +239,8 @@ diff -ru planner-0.14.4.orig/src/planner-task-tree.c planner-0.14.4/src/planner-
}
+}
-- cmd = planner_task_cmd_insert (tree->priv->main_window,
-- parent, position, work, work, NULL);
+- planner_task_cmd_insert (tree->priv->main_window,
+- parent, position, work, work, NULL);
+void
+planner_task_select_inserted_task (PlannerTaskTree *tree, GtkTreePath *path)
+{
@@ -250,7 +248,7 @@ diff -ru planner-0.14.4.orig/src/planner-task-tree.c planner-0.14.4/src/planner-
if (!GTK_WIDGET_HAS_FOCUS (tree)) {
gtk_widget_grab_focus (GTK_WIDGET (tree));
-@@ -2842,12 +2911,35 @@
+@@ -2822,12 +2892,35 @@
TRUE);
planner_task_tree_set_anchor (tree, path);
@@ -289,7 +287,7 @@ diff -ru planner-0.14.4.orig/src/planner-task-tree.c planner-0.14.4/src/planner-
{
PlannerTaskTreePriv *priv;
GList *list, *l;
-@@ -2873,7 +2965,7 @@
+@@ -2852,7 +2945,7 @@
if (many) {
planner_cmd_manager_begin_transaction (
planner_window_get_cmd_manager (priv->main_window),
@@ -298,16 +296,16 @@ diff -ru planner-0.14.4.orig/src/planner-task-tree.c planner-0.14.4/src/planner-
}
for (l = list; l; l = l->next) {
-@@ -2884,7 +2976,7 @@
+@@ -2863,7 +2956,7 @@
/* Children are removed with the parent. */
if (path != NULL) {
-- cmd = (TaskCmdRemove*) task_cmd_remove (tree, path, task);
-+ cmd = (TaskCmdRemove*) task_cmd_remove_with_undo_strings (tree, path, task, undostr);
+- task_cmd_remove (tree, path, task);
++ task_cmd_remove_with_undo_strings (tree, path, task, undostr);
}
gtk_tree_path_free (path);
}
-@@ -2900,6 +2992,12 @@
+@@ -2879,6 +2972,12 @@
}
void
@@ -320,7 +318,7 @@ diff -ru planner-0.14.4.orig/src/planner-task-tree.c planner-0.14.4/src/planner-
planner_task_tree_edit_task (PlannerTaskTree *tree, PlannerTaskDialogPage page)
{
PlannerTaskTreePriv *priv;
-@@ -3689,6 +3787,321 @@
+@@ -3662,6 +3761,321 @@
return list;
}
diff --git a/planner-gnome606824-notecolumn.patch b/planner-gnome606824-notecolumn.patch
index 5fd82a4..f337e77 100644
--- a/planner-gnome606824-notecolumn.patch
+++ b/planner-gnome606824-notecolumn.patch
@@ -55,15 +55,15 @@ diff -ru planner-0.14.4.orig/src/planner-gantt-model.c planner-0.14.4/src/planne
default:
return G_TYPE_INVALID;
}
-@@ -795,6 +797,7 @@
- MrpTaskType type;
+@@ -794,6 +796,7 @@
+ gint duration;
const gchar *name;
const gchar *cached_str;
+ const gchar *note = NULL;
g_return_if_fail (iter != NULL);
-@@ -897,6 +900,13 @@
+@@ -894,6 +897,13 @@
break;
diff --git a/planner-gnome615641-multiselect.patch b/planner-gnome615641-multiselect.patch
index be10809..640368a 100644
--- a/planner-gnome615641-multiselect.patch
+++ b/planner-gnome615641-multiselect.patch
@@ -104,7 +104,7 @@ diff -ru planner-0.14.5.orig/src/planner-calendar.c planner-0.14.5/src/planner-c
gtk_widget_queue_draw (GTK_WIDGET (calendar));
planner_calendar_thaw (calendar);
-@@ -809,13 +809,7 @@
+@@ -806,13 +806,7 @@
month_len = month_length[leap (calendar->year)][calendar->month + 1];
@@ -119,7 +119,7 @@ diff -ru planner-0.14.5.orig/src/planner-calendar.c planner-0.14.5/src/planner-c
gtk_widget_queue_draw (GTK_WIDGET (calendar));
planner_calendar_thaw (calendar);
-@@ -857,7 +851,7 @@
+@@ -854,7 +848,7 @@
if (!GTK_WIDGET_HAS_FOCUS (widget))
gtk_widget_grab_focus (widget);
@@ -128,15 +128,15 @@ diff -ru planner-0.14.5.orig/src/planner-calendar.c planner-0.14.5/src/planner-c
}
else if (event->type == GDK_2BUTTON_PRESS)
-@@ -1800,6 +1794,7 @@
+@@ -1791,6 +1785,7 @@
+ gint y_top;
gint y_loc;
- gint day_xspace;
gint focus_width;
+ gboolean is_selected_day;
PlannerCalendarPrivateData *private_data;
PangoLayout *layout;
-@@ -1829,6 +1824,8 @@
+@@ -1818,6 +1813,8 @@
day = calendar->day[row][col];
@@ -145,7 +145,7 @@ diff -ru planner-0.14.5.orig/src/planner-calendar.c planner-0.14.5/src/planner-c
x_left = left_x_for_column (calendar, col);
x_loc = x_left + private_data->day_width / 2 + private_data->max_day_char_width;
-@@ -1857,7 +1854,7 @@
+@@ -1846,7 +1843,7 @@
private_data->day_width, day_height);
}
*/
@@ -154,7 +154,7 @@ diff -ru planner-0.14.5.orig/src/planner-calendar.c planner-0.14.5/src/planner-c
{
gdk_gc_set_foreground (gc, SELECTED_BG_COLOR (GTK_WIDGET (calendar)));
gdk_draw_rectangle (private_data->main_win, gc, TRUE, x_left, y_top,
-@@ -1870,7 +1867,7 @@
+@@ -1859,7 +1856,7 @@
private_data->day_width, day_height);
}
@@ -163,25 +163,16 @@ diff -ru planner-0.14.5.orig/src/planner-calendar.c planner-0.14.5/src/planner-c
gdk_gc_set_foreground (gc, SELECTED_FG_COLOR (GTK_WIDGET (calendar)));
else
gdk_gc_set_foreground (gc, & (GTK_WIDGET (calendar)->style->fg[GTK_WIDGET_STATE (calendar)]));
-@@ -1892,15 +1889,14 @@
+@@ -1881,7 +1878,7 @@
{
- GtkStateType state;
-
-- if (calendar->selected_day == day)
-+ if (is_selected_day)
- state = GTK_WIDGET_HAS_FOCUS (widget) ? GTK_STATE_SELECTED : GTK_STATE_ACTIVE;
- else
- state = GTK_STATE_NORMAL;
-
gtk_paint_focus (widget->style,
private_data->main_win,
- (calendar->selected_day == day)
-- ? GTK_STATE_SELECTED : GTK_STATE_NORMAL,
-+ is_selected_day ? GTK_STATE_SELECTED : GTK_STATE_NORMAL,
++ is_selected_day
+ ? GTK_STATE_SELECTED : GTK_STATE_NORMAL,
NULL, widget, "calendar-day",
x_left, y_top,
- private_data->day_width,
-@@ -2171,31 +2167,17 @@
+@@ -2151,31 +2148,17 @@
return TRUE;
}
@@ -219,7 +210,7 @@ diff -ru planner-0.14.5.orig/src/planner-calendar.c planner-0.14.5/src/planner-c
if (GTK_WIDGET_DRAWABLE (GTK_WIDGET (calendar)))
planner_calendar_paint_day_num (GTK_WIDGET (calendar), day);
}
-@@ -2206,8 +2188,42 @@
+@@ -2186,8 +2169,42 @@
}
static void
@@ -263,7 +254,7 @@ diff -ru planner-0.14.5.orig/src/planner-calendar.c planner-0.14.5/src/planner-c
{
gint old_focus_row = calendar->focus_row;
gint old_focus_col = calendar->focus_col;
-@@ -2227,17 +2243,29 @@
+@@ -2207,17 +2224,29 @@
if (old_focus_row != -1 && old_focus_col != -1)
planner_calendar_paint_day (GTK_WIDGET (calendar), old_focus_row, old_focus_col);
@@ -300,7 +291,7 @@ diff -ru planner-0.14.5.orig/src/planner-calendar.c planner-0.14.5/src/planner-c
if (year)
*year = calendar->year;
-@@ -2245,8 +2273,7 @@
+@@ -2225,8 +2254,7 @@
if (month)
*month = calendar->month;
@@ -310,7 +301,7 @@ diff -ru planner-0.14.5.orig/src/planner-calendar.c planner-0.14.5/src/planner-c
}
static gboolean
-@@ -2547,11 +2574,16 @@
+@@ -2519,11 +2547,16 @@
static void
planner_calendar_finalize (GObject *object)
{
@@ -327,7 +318,7 @@ diff -ru planner-0.14.5.orig/src/planner-calendar.c planner-0.14.5/src/planner-c
if (G_OBJECT_CLASS (parent_class)->finalize)
(* G_OBJECT_CLASS (parent_class)->finalize) (object);
}
-@@ -2676,7 +2708,7 @@
+@@ -2648,7 +2681,7 @@
planner_calendar_set_month_next (calendar);
}
@@ -336,7 +327,7 @@ diff -ru planner-0.14.5.orig/src/planner-calendar.c planner-0.14.5/src/planner-c
planner_calendar_thaw (calendar);
}
-@@ -2725,7 +2757,8 @@
+@@ -2697,7 +2730,8 @@
GList *daytypes;
gint dayindex;
diff --git a/planner.spec b/planner.spec
index 1a15022..73c633e 100644
--- a/planner.spec
+++ b/planner.spec
@@ -6,12 +6,12 @@
Summary: A graphical project management tool
Name: planner
-Version: 0.14.5
-Release: 8%{?dist}
+Version: 0.14.6
+Release: 1%{?dist}
License: GPLv2+
Group: Applications/Productivity
URL: http://live.gnome.org/Planner
-Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.14/%{name}-%{version}.tar.bz2
+Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.14/%{name}-%{version}.tar.xz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtk2-devel >= 2.2.0, libgnomeui-devel >= 2.0.1
BuildRequires: libglade2-devel >= 2.0.0, gnome-vfs2-devel >= 2.0.2
@@ -185,6 +185,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pkgconfig/*
%changelog
+* Fri Mar 09 2012 Caolán McNamara <caolanm at redhat.com> - 0.14.6-1
+- latest version
+
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.14.5-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/sources b/sources
index 48a6358..85590d1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-611220d902eb93c74fc237cf02301e71 planner-0.14.5.tar.bz2
+605c589f2c9ec695df0ae79aed3e2e3b planner-0.14.6.tar.xz
More information about the scm-commits
mailing list