[planner/f15] Resolves: rhbz#719488 latest version
Caolan McNamara
caolanm at fedoraproject.org
Thu Jul 7 10:16:16 UTC 2011
commit 8707afe41cb33bb3ff4f6e8e85aa814febc7574e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jul 7 11:16:03 2011 +0100
Resolves: rhbz#719488 latest version
.gitignore | 2 +-
planner-0.14.4-edsapi.patch | 318 ++++++++--------
planner-backport-libegg-fixes.patch | 127 -------
planner-buildfix.patch | 28 --
planner-gnome341504-paste.tasks.patch | 30 +-
planner-gnome349304-recentlyused.patch | 398 --------------------
planner-gnome596173-xdg.patch | 115 +++---
planner-gnome596966-editoninsert.patch | 10 +-
...gnome603693-planner-calendar-for-edittask.patch | 79 ++--
planner-gnome604169-comboboxentry.patch | 38 +-
planner-gnome604355-scrolling.patch | 72 ----
planner-gnome604510.calcolors.patch | 58 ++--
planner-gnome604515-usagestatus.patch | 42 --
planner-gnome604531-tooltips.patch | 56 ++--
planner-gnome606824-notecolumn.patch | 26 +-
planner-gnome615641-multiselect.patch | 181 +++++-----
planner.spec | 58 ++--
sources | 2 +-
18 files changed, 482 insertions(+), 1158 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d85dbf3..9661503 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-planner-0.14.4.tar.bz2
+/planner-0.14.5.tar.bz2
diff --git a/planner-0.14.4-edsapi.patch b/planner-0.14.4-edsapi.patch
index 1eba442..e8b61cc 100644
--- a/planner-0.14.4-edsapi.patch
+++ b/planner-0.14.4-edsapi.patch
@@ -1,7 +1,7 @@
diff -ru planner-0.14.4.foo/eds-backend/e-cal-backend-planner.c planner-0.14.4/eds-backend/e-cal-backend-planner.c
--- planner-0.14.4.foo/eds-backend/e-cal-backend-planner.c 2010-07-19 10:51:35.000000000 +0100
+++ planner-0.14.4/eds-backend/e-cal-backend-planner.c 2010-07-19 11:47:55.000000000 +0100
-@@ -31,6 +31,8 @@
+@@ -30,6 +30,8 @@
#include <libplanner/mrp-project.h>
#include <libplanner/mrp-task.h>
@@ -10,48 +10,48 @@ diff -ru planner-0.14.4.foo/eds-backend/e-cal-backend-planner.c planner-0.14.4/e
/* Private part of the ECalBackendPlanner structure */
struct _ECalBackendPlannerPrivate {
/* uri to get planner data from */
-@@ -58,97 +60,115 @@
+@@ -57,97 +59,115 @@
/* Backend implementation */
static void cbp_dispose (GObject *object);
static void cbp_finalize (GObject *object);
--static ECalBackendSyncStatus cbp_is_read_only (ECalBackendSync *backend,
+-static ECalBackendSyncStatus cbp_is_read_only (ECalBackendSync *backend,
+static void cbp_is_read_only (ECalBackendSync *backend,
- EDataCal *cal,
+ EDataCal *cal,
- gboolean *read_only);
--static ECalBackendSyncStatus cbp_get_cal_address (ECalBackendSync *backend,
+-static ECalBackendSyncStatus cbp_get_cal_address (ECalBackendSync *backend,
+ gboolean *read_only,
+ GError **perror);
+static void cbp_get_cal_address (ECalBackendSync *backend,
- EDataCal *cal,
+ EDataCal *cal,
- char **address);
--static ECalBackendSyncStatus cbp_get_ldap_attribute (ECalBackendSync *backend,
+-static ECalBackendSyncStatus cbp_get_ldap_attribute (ECalBackendSync *backend,
+ char **address,
+ GError **perror);
+static void cbp_get_ldap_attribute (ECalBackendSync *backend,
- EDataCal *cal,
+ EDataCal *cal,
- char **attribute);
--static ECalBackendSyncStatus cbp_get_alarm_email_address (ECalBackendSync *backend,
+-static ECalBackendSyncStatus cbp_get_alarm_email_address (ECalBackendSync *backend,
+ char **attribute,
+ GError **perror);
+static void cbp_get_alarm_email_address (ECalBackendSync *backend,
- EDataCal *cal,
+ EDataCal *cal,
- char **address);
--static ECalBackendSyncStatus cbp_get_static_capabilities (ECalBackendSync *backend,
+-static ECalBackendSyncStatus cbp_get_static_capabilities (ECalBackendSync *backend,
+ char **address,
+ GError **perror);
+static void cbp_get_static_capabilities (ECalBackendSync *backend,
- EDataCal *cal,
+ EDataCal *cal,
- char **capabilities);
+ char **capabilities,
+ GError **perror);
--static ECalBackendSyncStatus cbp_open (ECalBackendSync *backend,
+-static ECalBackendSyncStatus cbp_open (ECalBackendSync *backend,
+static void cbp_open (ECalBackendSync *backend,
- EDataCal *cal,
+ EDataCal *cal,
gboolean only_if_exists,
- const gchar *username,
+ const gchar *username,
- const gchar *password);
--static ECalBackendSyncStatus cbp_remove (ECalBackendSync *backend,
+-static ECalBackendSyncStatus cbp_remove (ECalBackendSync *backend,
- EDataCal *cal);
+ const gchar *password,
+ GError **perror);
@@ -60,34 +60,34 @@ diff -ru planner-0.14.4.foo/eds-backend/e-cal-backend-planner.c planner-0.14.4/e
+ GError **perror);
static gboolean cbp_is_loaded (ECalBackend *backend);
static CalMode cbp_get_mode (ECalBackend *backend);
- static void cbp_set_mode (ECalBackend *backend,
+ static void cbp_set_mode (ECalBackend *backend,
CalMode mode);
--static ECalBackendSyncStatus cbp_get_default_object (ECalBackendSync *backend,
+-static ECalBackendSyncStatus cbp_get_default_object (ECalBackendSync *backend,
+static void cbp_get_default_object (ECalBackendSync *backend,
- EDataCal *cal,
+ EDataCal *cal,
- char **object);
--static ECalBackendSyncStatus cbp_get_object (ECalBackendSync *backend,
+-static ECalBackendSyncStatus cbp_get_object (ECalBackendSync *backend,
+ char **object,
+ GError **perror);
+static void cbp_get_object (ECalBackendSync *backend,
- EDataCal *cal,
- const gchar *uid,
- const gchar *rid,
+ EDataCal *cal,
+ const gchar *uid,
+ const gchar *rid,
- gchar **object);
--static ECalBackendSyncStatus cbp_get_timezone (ECalBackendSync *backend,
-- EDataCal *cal,
-- const gchar *tzid,
+-static ECalBackendSyncStatus cbp_get_timezone (ECalBackendSync *backend,
+- EDataCal *cal,
+- const gchar *tzid,
- char **object);
--static ECalBackendSyncStatus cbp_add_timezone (ECalBackendSync *backend,
+-static ECalBackendSyncStatus cbp_add_timezone (ECalBackendSync *backend,
+ gchar **object,
+ GError **error);
+static void cbp_add_timezone (ECalBackendSync *backend,
- EDataCal *cal,
+ EDataCal *cal,
- const gchar *tzobj);
--static ECalBackendSyncStatus cbp_set_default_timezone (ECalBackendSync *backend,
-- EDataCal *cal,
+-static ECalBackendSyncStatus cbp_set_default_timezone (ECalBackendSync *backend,
+- EDataCal *cal,
- const gchar *tzid);
--static ECalBackendSyncStatus cbp_get_object_list (ECalBackendSync *backend,
+-static ECalBackendSyncStatus cbp_get_object_list (ECalBackendSync *backend,
+ const gchar *tzobj,
+ GError **perror);
+static void cbp_set_default_zone_sync (ECalBackendSync *backend,
@@ -95,106 +95,106 @@ diff -ru planner-0.14.4.foo/eds-backend/e-cal-backend-planner.c planner-0.14.4/e
+ const gchar *tzid,
+ GError **perror);
+static void cbp_get_object_list (ECalBackendSync *backend,
- EDataCal *cal,
- const gchar *sexp,
+ EDataCal *cal,
+ const gchar *sexp,
- GList **objects);
--static void cbp_start_query (ECalBackend *backend,
+-static void cbp_start_query (ECalBackend *backend,
+ GList **objects,
+ GError **perror);
+static void cbp_start_query (ECalBackend *backend,
EDataCalView *query);
--static ECalBackendSyncStatus cbp_get_free_busy (ECalBackendSync *backend,
+-static ECalBackendSyncStatus cbp_get_free_busy (ECalBackendSync *backend,
+static void cbp_get_free_busy (ECalBackendSync *backend,
- EDataCal *cal,
+ EDataCal *cal,
GList *users,
- time_t start,
- time_t end,
+ time_t start,
+ time_t end,
- GList **freebusy);
--static ECalBackendSyncStatus cbp_get_changes (ECalBackendSync *backend,
+-static ECalBackendSyncStatus cbp_get_changes (ECalBackendSync *backend,
+ GList **freebusy,
+ GError **perror);
+static void cbp_get_changes (ECalBackendSync *backend,
- EDataCal *cal,
+ EDataCal *cal,
const char *change_id,
- GList **adds,
- GList **modifies,
+ GList **adds,
+ GList **modifies,
- GList **deletes);
--static ECalBackendSyncStatus cbp_discard_alarm (ECalBackendSync *backend,
+-static ECalBackendSyncStatus cbp_discard_alarm (ECalBackendSync *backend,
+ GList **deletes,
+ GError **perror);
+static void cbp_discard_alarm (ECalBackendSync *backend,
- EDataCal *cal,
- const gchar *uid,
+ EDataCal *cal,
+ const gchar *uid,
- const gchar *auid);
--static ECalBackendSyncStatus cbp_create_object (ECalBackendSync *backend,
+-static ECalBackendSyncStatus cbp_create_object (ECalBackendSync *backend,
+ const gchar *auid,
+ GError **perror);
+static void cbp_create_object (ECalBackendSync *backend,
- EDataCal *cal,
- gchar **calobj,
+ EDataCal *cal,
+ gchar **calobj,
- gchar **uid);
--static ECalBackendSyncStatus cbp_modify_object (ECalBackendSync *backend,
+-static ECalBackendSyncStatus cbp_modify_object (ECalBackendSync *backend,
+ gchar **uid,
+ GError **perror);
+static void cbp_modify_object (ECalBackendSync *backend,
- EDataCal *cal,
- const gchar *calobj,
- CalObjModType mod,
+ EDataCal *cal,
+ const gchar *calobj,
+ CalObjModType mod,
- char **old_object);
--static ECalBackendSyncStatus cbp_remove_object (ECalBackendSync *backend,
+-static ECalBackendSyncStatus cbp_remove_object (ECalBackendSync *backend,
+ char **old_object,
+ char **new_object,
+ GError **perror);
+static void cbp_remove_object (ECalBackendSync *backend,
EDataCal *cal,
- const gchar *uid,
+ const gchar *uid,
const gchar *rid,
- CalObjModType mod,
+ CalObjModType mod,
- gchar **object);
--static ECalBackendSyncStatus cbp_receive_objects (ECalBackendSync *backend,
+-static ECalBackendSyncStatus cbp_receive_objects (ECalBackendSync *backend,
+ gchar **old_object,
+ gchar **object,
+ GError **perror);
+static void cbp_receive_objects (ECalBackendSync *backend,
- EDataCal *cal,
+ EDataCal *cal,
- const gchar *calobj);
+ const gchar *calobj,
+ GError **perror);
--static ECalBackendSyncStatus cbp_send_objects (ECalBackendSync *backend,
+-static ECalBackendSyncStatus cbp_send_objects (ECalBackendSync *backend,
+static void cbp_send_objects (ECalBackendSync *backend,
- EDataCal *cal,
- const gchar *calobj,
+ EDataCal *cal,
+ const gchar *calobj,
GList **users,
- gchar **modified_calobj);
+ gchar **modified_calobj,
+ GError **perror);
static icaltimezone * cbp_internal_get_default_timezone (ECalBackend *backend);
- static icaltimezone * cbp_internal_get_timezone (ECalBackend *backend,
-@@ -374,56 +394,51 @@
+ static icaltimezone * cbp_internal_get_timezone (ECalBackend *backend,
+@@ -373,56 +393,51 @@
/* Is_read_only handler for the file backend */
/* It will be read and write in the future */
-static ECalBackendSyncStatus
+static void
- cbp_is_read_only (ECalBackendSync *backend,
- EDataCal *cal,
+ cbp_is_read_only (ECalBackendSync *backend,
+ EDataCal *cal,
- gboolean *read_only)
+ gboolean *read_only,
+ GError **perror)
{
*read_only = FALSE;
--
+-
- return GNOME_Evolution_Calendar_Success;
}
- /* FIXME: The only address for the Planner backend is the file
+ /* FIXME: The only address for the Planner backend is the file
for the moment. Later we will have a URI */
-static ECalBackendSyncStatus
+static void
- cbp_get_cal_address (ECalBackendSync *backend,
- EDataCal *cal,
+ cbp_get_cal_address (ECalBackendSync *backend,
+ EDataCal *cal,
- char **address)
+ char **address,
+ GError **perror)
@@ -206,34 +206,34 @@ diff -ru planner-0.14.4.foo/eds-backend/e-cal-backend-planner.c planner-0.14.4/e
-static ECalBackendSyncStatus
+static void
- cbp_get_ldap_attribute (ECalBackendSync *backend,
- EDataCal *cal,
+ cbp_get_ldap_attribute (ECalBackendSync *backend,
+ EDataCal *cal,
- char **attribute)
+ char **attribute,
+ GError **perror)
{
*attribute = NULL;
--
+-
- return GNOME_Evolution_Calendar_Success;
}
-static ECalBackendSyncStatus
+static void
- cbp_get_alarm_email_address (ECalBackendSync *backend,
- EDataCal *cal,
+ cbp_get_alarm_email_address (ECalBackendSync *backend,
+ EDataCal *cal,
- char **address)
+ char **address,
+ GError **perror)
{
*address = NULL;
--
+-
- return GNOME_Evolution_Calendar_Success;
}
-static ECalBackendSyncStatus
+static void
- cbp_get_static_capabilities (ECalBackendSync *backend,
- EDataCal *cal,
+ cbp_get_static_capabilities (ECalBackendSync *backend,
+ EDataCal *cal,
- char **capabilities)
+ char **capabilities,
+ GError **perror)
@@ -244,23 +244,23 @@ diff -ru planner-0.14.4.foo/eds-backend/e-cal-backend-planner.c planner-0.14.4/e
}
static ECalComponent *
-@@ -805,12 +820,13 @@
+@@ -804,12 +819,13 @@
}
/* Open handler for the file backend */
-static ECalBackendSyncStatus
+static void
- cbp_open (ECalBackendSync *backend,
- EDataCal *cal,
+ cbp_open (ECalBackendSync *backend,
+ EDataCal *cal,
gboolean only_if_exists,
- const gchar *username,
+ const gchar *username,
- const gchar *password)
+ const gchar *password,
+ GError **perror)
{
ECalBackendPlanner *cbplanner;
ECalBackendPlannerPrivate *priv;
-@@ -827,7 +843,8 @@
+@@ -826,7 +842,8 @@
}
if (!uri) {
e_cal_backend_notify_error (E_CAL_BACKEND (backend), _("Invalid server URI"));
@@ -268,18 +268,18 @@ diff -ru planner-0.14.4.foo/eds-backend/e-cal-backend-planner.c planner-0.14.4/e
+ g_propagate_error (perror, EDC_ERROR (NoSuchCal));
+ return;
}
-
+
cbplanner = E_CAL_BACKEND_PLANNER (backend);
-@@ -835,7 +852,7 @@
+@@ -834,7 +851,7 @@
if (priv->project_loaded) {
g_warning ("Reopening project ... we need to check for new tasks ...");
-- return GNOME_Evolution_Calendar_Success;
+- return GNOME_Evolution_Calendar_Success;
+ return;
} else {
g_warning ("Openinig project for the first time ...");
}
-@@ -848,17 +865,19 @@
+@@ -847,17 +864,19 @@
task_add_properties (priv->project);
g_idle_add ((GSourceFunc) get_planner_tasks_cb, cbplanner);
priv->project_loaded = TRUE;
@@ -296,14 +296,14 @@ diff -ru planner-0.14.4.foo/eds-backend/e-cal-backend-planner.c planner-0.14.4/e
-static ECalBackendSyncStatus
+static void
- cbp_remove (ECalBackendSync *backend,
+ cbp_remove (ECalBackendSync *backend,
- EDataCal *cal)
+ EDataCal *cal,
+ GError **perror)
{
ECalBackendPlanner *cbplanner;
ECalBackendPlannerPrivate *priv;
-@@ -868,7 +887,7 @@
+@@ -867,7 +886,7 @@
/* e_file_cache_remove (E_FILE_CACHE (priv->cache)); */
/* FIXME: we need to remove the task from Planner */
@@ -312,7 +312,7 @@ diff -ru planner-0.14.4.foo/eds-backend/e-cal-backend-planner.c planner-0.14.4/e
}
/* is_loaded handler for the planner backend */
-@@ -904,7 +923,7 @@
+@@ -903,7 +922,7 @@
{
ECalBackendPlanner *cbplanner;
ECalBackendPlannerPrivate *priv;
@@ -321,7 +321,7 @@ diff -ru planner-0.14.4.foo/eds-backend/e-cal-backend-planner.c planner-0.14.4/e
cbplanner = E_CAL_BACKEND_PLANNER (backend);
priv = cbplanner->priv;
-@@ -917,27 +936,28 @@
+@@ -916,27 +935,28 @@
break;
case CAL_MODE_ANY:
priv->mode = CAL_MODE_REMOTE;
@@ -349,15 +349,15 @@ diff -ru planner-0.14.4.foo/eds-backend/e-cal-backend-planner.c planner-0.14.4/e
-static ECalBackendSyncStatus
+static void
- cbp_get_default_object (ECalBackendSync *backend,
- EDataCal *cal,
+ cbp_get_default_object (ECalBackendSync *backend,
+ EDataCal *cal,
- char **object)
+ char **object,
+ GError **perror)
{
ECalBackendPlanner *cbplanner;
ECalBackendPlannerPrivate *priv;
-@@ -951,17 +971,16 @@
+@@ -950,17 +970,16 @@
icalcomp = e_cal_util_new_component (kind);
*object = g_strdup (icalcomponent_as_ical_string (icalcomp));
icalcomponent_free (icalcomp);
@@ -368,17 +368,17 @@ diff -ru planner-0.14.4.foo/eds-backend/e-cal-backend-planner.c planner-0.14.4/e
/* Get_object_component handler for the planner backend */
-static ECalBackendSyncStatus
+static void
- cbp_get_object (ECalBackendSync *backend,
- EDataCal *cal,
- const gchar *uid,
- const gchar *rid,
+ cbp_get_object (ECalBackendSync *backend,
+ EDataCal *cal,
+ const gchar *uid,
+ const gchar *rid,
- gchar **object)
+ gchar **object,
+ GError **perror)
{
ECalBackendPlanner *cbplanner;
ECalBackendPlannerPrivate *priv;
-@@ -970,83 +989,56 @@
+@@ -969,83 +988,56 @@
cbplanner = E_CAL_BACKEND_PLANNER (backend);
priv = cbplanner->priv;
@@ -389,7 +389,7 @@ diff -ru planner-0.14.4.foo/eds-backend/e-cal-backend-planner.c planner-0.14.4/e
+ return;
+ }
- comp = g_hash_table_lookup (priv->tasks_comp, uid);
+ comp = g_hash_table_lookup (priv->tasks_comp, uid);
/* comp = e_cal_backend_cache_get_component (priv->cache, uid, rid); */
/* We take the comp directly from libplanner */
if (!comp)
@@ -406,9 +406,9 @@ diff -ru planner-0.14.4.foo/eds-backend/e-cal-backend-planner.c planner-0.14.4/e
-
-/* Get_timezone_object handler for the file backend */
-static ECalBackendSyncStatus
--cbp_get_timezone (ECalBackendSync *backend,
-- EDataCal *cal,
-- const gchar *tzid,
+-cbp_get_timezone (ECalBackendSync *backend,
+- EDataCal *cal,
+- const gchar *tzid,
- char **object)
-{
- ECalBackendPlanner *cbplanner;
@@ -437,8 +437,8 @@ diff -ru planner-0.14.4.foo/eds-backend/e-cal-backend-planner.c planner-0.14.4/e
/* Add_timezone handler for the file backend */
-static ECalBackendSyncStatus
+static void
- cbp_add_timezone (ECalBackendSync *backend,
- EDataCal *cal,
+ cbp_add_timezone (ECalBackendSync *backend,
+ EDataCal *cal,
- const gchar *tzobj)
+ const gchar *tzobj,
+ GError **perror)
@@ -448,7 +448,7 @@ diff -ru planner-0.14.4.foo/eds-backend/e-cal-backend-planner.c planner-0.14.4/e
cbplanner = (ECalBackendPlanner *) backend;
-- g_return_val_if_fail (E_IS_CAL_BACKEND_PLANNER (cbplanner),
+- g_return_val_if_fail (E_IS_CAL_BACKEND_PLANNER (cbplanner),
- GNOME_Evolution_Calendar_OtherError);
- g_return_val_if_fail (tzobj != NULL, GNOME_Evolution_Calendar_OtherError);
+ if (!E_IS_CAL_BACKEND_PLANNER (cbplanner) || tzobj == NULL)
@@ -464,8 +464,8 @@ diff -ru planner-0.14.4.foo/eds-backend/e-cal-backend-planner.c planner-0.14.4/e
}
-static ECalBackendSyncStatus
--cbp_set_default_timezone (ECalBackendSync *backend,
-- EDataCal *cal,
+-cbp_set_default_timezone (ECalBackendSync *backend,
+- EDataCal *cal,
- const gchar *tzid)
+static void
+cbp_set_default_zone_sync (ECalBackendSync *backend,
@@ -480,7 +480,7 @@ diff -ru planner-0.14.4.foo/eds-backend/e-cal-backend-planner.c planner-0.14.4/e
- cbplanner = E_CAL_BACKEND_PLANNER (backend);
- priv = cbplanner->priv;
--
+-
- /* FIXME */
- return GNOME_Evolution_Calendar_Success;
+ cbplanner = E_CAL_BACKEND_PLANNER (backend);
@@ -488,22 +488,22 @@ diff -ru planner-0.14.4.foo/eds-backend/e-cal-backend-planner.c planner-0.14.4/e
}
static void
-@@ -1061,11 +1053,12 @@
+@@ -1060,11 +1052,12 @@
/* Get_objects_in_range handler for the planner backend */
-static ECalBackendSyncStatus
+static void
- cbp_get_object_list (ECalBackendSync *backend,
- EDataCal *cal,
- const gchar *sexp,
+ cbp_get_object_list (ECalBackendSync *backend,
+ EDataCal *cal,
+ const gchar *sexp,
- GList **objects)
+ GList **objects,
+ GError **perror)
{
ECalBackendPlanner *cbplanner;
ECalBackendPlannerPrivate *priv;
-@@ -1092,7 +1085,6 @@
+@@ -1091,7 +1084,6 @@
g_list_free (comps);
g_object_unref (cbsexp);
@@ -511,7 +511,7 @@ diff -ru planner-0.14.4.foo/eds-backend/e-cal-backend-planner.c planner-0.14.4/e
}
/* get_query handler for the planner backend */
-@@ -1133,17 +1125,18 @@
+@@ -1132,17 +1124,18 @@
g_list_free (objects);
g_object_unref (cbsexp);
@@ -522,22 +522,22 @@ diff -ru planner-0.14.4.foo/eds-backend/e-cal-backend-planner.c planner-0.14.4/e
/* Get_free_busy handler for the planner backend */
-static ECalBackendSyncStatus
+static void
- cbp_get_free_busy (ECalBackendSync *backend,
- EDataCal *cal,
+ cbp_get_free_busy (ECalBackendSync *backend,
+ EDataCal *cal,
GList *users,
- time_t start,
- time_t end,
+ time_t start,
+ time_t end,
- GList **freebusy)
+ GList **freebusy,
+ GError **perror)
{
ECalBackendPlanner *cbplanner;
ECalBackendPlannerPrivate *priv;
-@@ -1151,22 +1144,19 @@
+@@ -1150,22 +1143,19 @@
cbplanner = E_CAL_BACKEND_PLANNER (backend);
priv = cbplanner->priv;
-- g_return_val_if_fail (start != -1 && end != -1,
+- g_return_val_if_fail (start != -1 && end != -1,
- GNOME_Evolution_Calendar_InvalidRange);
- g_return_val_if_fail (start <= end, GNOME_Evolution_Calendar_InvalidRange);
-
@@ -550,18 +550,18 @@ diff -ru planner-0.14.4.foo/eds-backend/e-cal-backend-planner.c planner-0.14.4/e
/* Get_changes handler for the planner backend */
-static ECalBackendSyncStatus
+static void
- cbp_get_changes (ECalBackendSync *backend,
- EDataCal *cal,
+ cbp_get_changes (ECalBackendSync *backend,
+ EDataCal *cal,
const char *change_id,
- GList **adds,
- GList **modifies,
+ GList **adds,
+ GList **modifies,
- GList **deletes)
+ GList **deletes,
+ GError **perror)
{
ECalBackendPlanner *cbplanner;
ECalBackendPlannerPrivate *priv;
-@@ -1174,34 +1164,31 @@
+@@ -1173,34 +1163,31 @@
cbplanner = E_CAL_BACKEND_PLANNER (backend);
priv = cbplanner->priv;
@@ -576,9 +576,9 @@ diff -ru planner-0.14.4.foo/eds-backend/e-cal-backend-planner.c planner-0.14.4/e
/* Discard_alarm handler for the planner backend */
-static ECalBackendSyncStatus
+static void
- cbp_discard_alarm (ECalBackendSync *backend,
- EDataCal *cal,
- const gchar *uid,
+ cbp_discard_alarm (ECalBackendSync *backend,
+ EDataCal *cal,
+ const gchar *uid,
- const gchar *auid)
+ const gchar *auid,
+ GError **perror)
@@ -595,16 +595,16 @@ diff -ru planner-0.14.4.foo/eds-backend/e-cal-backend-planner.c planner-0.14.4/e
-static ECalBackendSyncStatus
+static void
- cbp_create_object (ECalBackendSync *backend,
- EDataCal *cal,
- gchar **calobj,
+ cbp_create_object (ECalBackendSync *backend,
+ EDataCal *cal,
+ gchar **calobj,
- gchar **uid)
+ gchar **uid,
+ GError **perror)
{
ECalBackendPlanner *cbplanner;
ECalBackendPlannerPrivate *priv;
-@@ -1215,17 +1202,29 @@
+@@ -1214,17 +1201,29 @@
cbplanner = E_CAL_BACKEND_PLANNER (backend);
priv = cbplanner->priv;
@@ -638,7 +638,7 @@ diff -ru planner-0.14.4.foo/eds-backend/e-cal-backend-planner.c planner-0.14.4/e
}
/* Get the UID to try to find the object */
-@@ -1236,7 +1235,8 @@
+@@ -1235,7 +1234,8 @@
new_uid = e_cal_component_gen_uid ();
if (!new_uid) {
icalcomponent_free (icalcomp);
@@ -648,7 +648,7 @@ diff -ru planner-0.14.4.foo/eds-backend/e-cal-backend-planner.c planner-0.14.4/e
}
icalcomponent_set_uid (icalcomp, new_uid);
-@@ -1251,7 +1251,8 @@
+@@ -1250,7 +1250,8 @@
/* check the object is not in our cache */
if (lookup_component (cbplanner, comp_uid)) {
icalcomponent_free (icalcomp);
@@ -658,7 +658,7 @@ diff -ru planner-0.14.4.foo/eds-backend/e-cal-backend-planner.c planner-0.14.4/e
}
/* Create the cal component */
-@@ -1271,21 +1272,20 @@
+@@ -1270,21 +1271,20 @@
/* Save the planner project */
mrp_project_save (priv->project, TRUE, &error);
@@ -667,16 +667,16 @@ diff -ru planner-0.14.4.foo/eds-backend/e-cal-backend-planner.c planner-0.14.4/e
- /* return GNOME_Evolution_Calendar_PermissionDenied; */
}
- /* FIXME: not finished.
+ /* FIXME: not finished.
This method is called for the moment when:
- You check the done checkbox
*/
-static ECalBackendSyncStatus
+static void
- cbp_modify_object (ECalBackendSync *backend,
- EDataCal *cal,
- const gchar *calobj,
- CalObjModType mod,
+ cbp_modify_object (ECalBackendSync *backend,
+ EDataCal *cal,
+ const gchar *calobj,
+ CalObjModType mod,
- char **old_object)
+ char **old_object,
+ char **new_object,
@@ -684,11 +684,11 @@ diff -ru planner-0.14.4.foo/eds-backend/e-cal-backend-planner.c planner-0.14.4/e
{
ECalBackendPlanner *cbplanner;
ECalBackendPlannerPrivate *priv;
-@@ -1300,14 +1300,24 @@
+@@ -1299,14 +1299,24 @@
cbplanner = E_CAL_BACKEND_PLANNER (backend);
priv = cbplanner->priv;
-- g_return_val_if_fail (E_IS_CAL_BACKEND_PLANNER (cbplanner),
+- g_return_val_if_fail (E_IS_CAL_BACKEND_PLANNER (cbplanner),
- GNOME_Evolution_Calendar_InvalidObject);
- g_return_val_if_fail (calobj != NULL, GNOME_Evolution_Calendar_ObjectNotFound);
+ if (!E_IS_CAL_BACKEND_PLANNER (cbplanner))
@@ -713,7 +713,7 @@ diff -ru planner-0.14.4.foo/eds-backend/e-cal-backend-planner.c planner-0.14.4/e
comp_uid = icalcomponent_get_uid (icalcomp);
g_message ("Modifying calendar object %s\n%s", comp_uid, calobj);
-@@ -1318,7 +1328,8 @@
+@@ -1317,7 +1327,8 @@
if (!(cache_comp = lookup_component (cbplanner, comp_uid))) {
g_message ("CRITICAL : Could not find the object in cache %s", comp_uid);
icalcomponent_free (icalcomp);
@@ -723,7 +723,7 @@ diff -ru planner-0.14.4.foo/eds-backend/e-cal-backend-planner.c planner-0.14.4/e
} else {
g_message ("Cache object found %s... modifying it", comp_uid);
}
-@@ -1330,13 +1341,15 @@
+@@ -1329,13 +1340,15 @@
if (task == NULL) {
g_message ("Cache fail: can't find task for component %s", comp_uid);
g_object_unref (cache_comp);
@@ -741,7 +741,7 @@ diff -ru planner-0.14.4.foo/eds-backend/e-cal-backend-planner.c planner-0.14.4/e
}
g_hash_table_replace (priv->tasks_comp, (gpointer) comp_uid, comp);
task_replace (priv->project, task, task_new);
-@@ -1349,19 +1362,18 @@
+@@ -1348,19 +1361,18 @@
*old_object = e_cal_component_get_as_string (cache_comp);
g_object_unref (cache_comp);
@@ -753,11 +753,11 @@ diff -ru planner-0.14.4.foo/eds-backend/e-cal-backend-planner.c planner-0.14.4/e
/* Remove_object handler for the planner backend */
-static ECalBackendSyncStatus
+static void
- cbp_remove_object (ECalBackendSync *backend,
+ cbp_remove_object (ECalBackendSync *backend,
EDataCal *cal,
- const gchar *uid,
+ const gchar *uid,
const gchar *rid,
- CalObjModType mod,
+ CalObjModType mod,
- gchar **object)
+ gchar **old_object,
+ gchar **object,
@@ -765,7 +765,7 @@ diff -ru planner-0.14.4.foo/eds-backend/e-cal-backend-planner.c planner-0.14.4/e
{
ECalBackendPlanner *cbplanner;
ECalBackendPlannerPrivate *priv;
-@@ -1372,7 +1384,11 @@
+@@ -1371,7 +1383,11 @@
cbplanner = E_CAL_BACKEND_PLANNER (backend);
priv = cbplanner->priv;
@@ -778,7 +778,7 @@ diff -ru planner-0.14.4.foo/eds-backend/e-cal-backend-planner.c planner-0.14.4/e
g_message ("Removing object %s ...", uid);
comp = lookup_component (cbplanner, uid);
-@@ -1382,15 +1398,14 @@
+@@ -1381,15 +1397,14 @@
mrp_project_remove_task (priv->project, task);
g_object_unref (task);
mrp_project_save (priv->project, TRUE, &error);
@@ -789,15 +789,15 @@ diff -ru planner-0.14.4.foo/eds-backend/e-cal-backend-planner.c planner-0.14.4/e
/* Update_objects handler for the planner backend. */
-static ECalBackendSyncStatus
+static void
- cbp_receive_objects (ECalBackendSync *backend,
- EDataCal *cal,
+ cbp_receive_objects (ECalBackendSync *backend,
+ EDataCal *cal,
- const gchar *calobj)
+ const gchar *calobj,
+ GError **perror)
{
ECalBackendPlanner *cbplanner;
ECalBackendPlannerPrivate *priv;
-@@ -1400,26 +1415,29 @@
+@@ -1399,26 +1414,29 @@
cbplanner = E_CAL_BACKEND_PLANNER (backend);
priv = cbplanner->priv;
@@ -817,18 +817,18 @@ diff -ru planner-0.14.4.foo/eds-backend/e-cal-backend-planner.c planner-0.14.4/e
+ }
g_message ("Modifying object: %s", calobj);
--
+-
-
- /* return GNOME_Evolution_Calendar_PermissionDenied;*/
- return GNOME_Evolution_Calendar_Success;
--
+-
}
-static ECalBackendSyncStatus
+static void
- cbp_send_objects (ECalBackendSync *backend,
- EDataCal *cal,
- const gchar *calobj,
+ cbp_send_objects (ECalBackendSync *backend,
+ EDataCal *cal,
+ const gchar *calobj,
GList **users,
- gchar **modified_calobj)
+ gchar **modified_calobj,
@@ -836,7 +836,7 @@ diff -ru planner-0.14.4.foo/eds-backend/e-cal-backend-planner.c planner-0.14.4/e
{
ECalBackendPlanner *cbplanner;
ECalBackendPlannerPrivate *priv;
-@@ -1432,7 +1450,7 @@
+@@ -1431,7 +1449,7 @@
g_message ("Sending objects ...");
@@ -845,7 +845,7 @@ diff -ru planner-0.14.4.foo/eds-backend/e-cal-backend-planner.c planner-0.14.4/e
}
static icaltimezone *
-@@ -1518,9 +1536,9 @@
+@@ -1517,9 +1535,9 @@
sync_class->get_default_object_sync = cbp_get_default_object;
sync_class->get_object_sync = cbp_get_object;
sync_class->get_object_list_sync = cbp_get_object_list;
diff --git a/planner-gnome341504-paste.tasks.patch b/planner-gnome341504-paste.tasks.patch
index b525e64..1eb8732 100644
--- a/planner-gnome341504-paste.tasks.patch
+++ b/planner-gnome341504-paste.tasks.patch
@@ -50,7 +50,7 @@ diff -ru planner-0.14.4.orig/src/planner-task-tree.c planner-0.14.4/src/planner-
PlannerTaskTreePriv *priv = tree->priv;
PlannerCmd *cmd_base;
TaskCmdRemove *cmd;
-
+
cmd_base = planner_cmd_new (TaskCmdRemove,
- _("Remove task"),
+ undostr,
@@ -67,7 +67,7 @@ diff -ru planner-0.14.4.orig/src/planner-task-tree.c planner-0.14.4/src/planner-
@@ -1048,6 +1064,54 @@
planner_marshal_VOID__OBJECT_OBJECT,
- G_TYPE_NONE,
+ G_TYPE_NONE,
2, MRP_TYPE_TASK, MRP_TYPE_RELATION);
+
+ klass->cut_clipboard = planner_task_tree_cut_clipboard;
@@ -135,17 +135,17 @@ 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;
-@@ -1083,6 +1155,9 @@
-
+@@ -1084,6 +1156,9 @@
tree = PLANNER_TASK_TREE (object);
priv = tree->priv;
-+
+
+ planner_task_tree_free_target_lists (tree);
+ planner_task_tree_free_selection (tree);
-
++
g_hash_table_destroy (priv->property_to_column);
-@@ -2758,78 +2833,72 @@
+ planner_task_tree_set_anchor (tree, NULL);
+@@ -2758,77 +2833,71 @@
g_list_free (list);
}
@@ -166,7 +166,7 @@ diff -ru planner-0.14.4.orig/src/planner-task-tree.c planner-0.14.4/src/planner-
- PlannerCmd *cmd;
priv = tree->priv;
-
+
list = planner_task_tree_get_selected_tasks (tree);
if (list == NULL) {
- parent = NULL;
@@ -209,7 +209,7 @@ diff -ru planner-0.14.4.orig/src/planner-task-tree.c planner-0.14.4/src/planner-
root = mrp_project_get_root_task (priv->project);
- position = mrp_task_get_n_children (root);
+ *position = mrp_task_get_n_children (root);
-
+
- gtk_tree_path_append_index (path, position);
+ gtk_tree_path_append_index (*path, *position);
}
@@ -218,7 +218,7 @@ diff -ru planner-0.14.4.orig/src/planner-task-tree.c planner-0.14.4/src/planner-
- work = mrp_calendar_day_get_total_work (
- mrp_project_get_calendar (priv->project),
- mrp_day_get_work ());
--
+-
- depth = gtk_tree_path_get_depth (path);
- position = gtk_tree_path_get_indices (path)[depth - 1];
+ depth = gtk_tree_path_get_depth (*path);
@@ -240,18 +240,16 @@ diff -ru planner-0.14.4.orig/src/planner-task-tree.c planner-0.14.4/src/planner-
+ *parent = NULL;
}
+}
-+
+
+- cmd = planner_task_cmd_insert (tree->priv->main_window,
+- parent, position, work, work, NULL);
+void
+planner_task_select_inserted_task (PlannerTaskTree *tree, GtkTreePath *path)
+{
+ GtkTreeView *tree_view;
-- cmd = planner_task_cmd_insert (tree->priv->main_window,
-- parent, position, work, work, NULL);
--
if (!GTK_WIDGET_HAS_FOCUS (tree)) {
gtk_widget_grab_focus (GTK_WIDGET (tree));
- }
@@ -2842,12 +2911,35 @@
TRUE);
@@ -298,7 +296,7 @@ diff -ru planner-0.14.4.orig/src/planner-task-tree.c planner-0.14.4/src/planner-
- _("Remove tasks"));
+ multiundostr);
}
-
+
for (l = list; l; l = l->next) {
@@ -2884,7 +2976,7 @@
diff --git a/planner-gnome596173-xdg.patch b/planner-gnome596173-xdg.patch
index 69a2278..98630ef 100644
--- a/planner-gnome596173-xdg.patch
+++ b/planner-gnome596173-xdg.patch
@@ -1,40 +1,40 @@
-diff -ru planner-0.14.4.orig/src/planner-msp-plugin.c planner-0.14.4/src/planner-msp-plugin.c
---- planner-0.14.4.orig/src/planner-msp-plugin.c 2009-09-24 11:12:52.000000000 +0100
-+++ planner-0.14.4/src/planner-msp-plugin.c 2009-09-24 11:19:20.000000000 +0100
-@@ -178,7 +178,7 @@
-
+diff -ru planner-0.14.5.orig/src/planner-msp-plugin.c planner-0.14.5/src/planner-msp-plugin.c
+--- planner-0.14.5.orig/src/planner-msp-plugin.c 2009-09-24 11:12:52.000000000 +0100
++++ planner-0.14.5/src/planner-msp-plugin.c 2009-09-24 11:19:20.000000000 +0100
+@@ -177,7 +177,7 @@
+
dir = planner_conf_get_string (CONF_MSP_PLUGIN_LAST_DIR, NULL);
if (dir == NULL) {
- dir = g_strdup (g_get_home_dir ());
+ dir = g_strdup (g_get_user_special_dir (G_USER_DIRECTORY_DOCUMENTS));
}
-
+
return dir;
-diff -ru planner-0.14.4.orig/src/planner-print-dialog.c planner-0.14.4/src/planner-print-dialog.c
---- planner-0.14.4.orig/src/planner-print-dialog.c 2009-09-24 11:12:52.000000000 +0100
-+++ planner-0.14.4/src/planner-print-dialog.c 2009-09-24 11:13:10.000000000 +0100
+diff -ru planner-0.14.5.orig/src/planner-print-dialog.c planner-0.14.5/src/planner-print-dialog.c
+--- planner-0.14.5.orig/src/planner-print-dialog.c 2009-09-24 11:12:52.000000000 +0100
++++ planner-0.14.5/src/planner-print-dialog.c 2009-09-24 11:13:10.000000000 +0100
@@ -43,7 +43,7 @@
{
char *dir;
-
+
- dir = g_build_filename (g_get_home_dir (), ".gnome2", NULL);
+ dir = g_build_filename (g_get_user_config_dir (), NULL);
-
+
if (!g_file_test (dir, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)) {
if (g_mkdir (dir, 0755) != 0) {
@@ -54,7 +54,7 @@
-
+
g_free (dir);
-
+
- dir = g_build_filename (g_get_home_dir (), ".gnome2", "planner", NULL);
+ dir = g_build_filename (g_get_user_config_dir (), "planner", NULL);
-
+
if (!g_file_test (dir, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)) {
if (g_mkdir (dir, 0755) != 0) {
@@ -75,6 +75,19 @@
return NULL;
}
-
+
+ return g_build_filename (g_get_user_config_dir (),
+ "planner",
+ PLANNER_PRINT_CONFIG_FILE,
@@ -47,7 +47,7 @@ diff -ru planner-0.14.4.orig/src/planner-print-dialog.c planner-0.14.4/src/plann
+ if (!ensure_dir ()) {
+ return NULL;
+ }
-+
++
return g_build_filename (g_get_home_dir (),
".gnome2", "planner",
PLANNER_PRINT_CONFIG_FILE,
@@ -73,32 +73,31 @@ diff -ru planner-0.14.4.orig/src/planner-print-dialog.c planner-0.14.4/src/plann
if (success) {
settings = gtk_print_settings_new_from_key_file (key_file, NULL, NULL);
}
-diff -ru planner-0.14.4.orig/src/planner-python-plugin.c planner-0.14.4/src/planner-python-plugin.c
---- planner-0.14.4.orig/src/planner-python-plugin.c 2009-09-24 11:12:52.000000000 +0100
-+++ planner-0.14.4/src/planner-python-plugin.c 2009-09-24 11:31:06.000000000 +0100
-@@ -127,27 +127,14 @@
+diff -ru planner-0.14.5.orig/src/planner-python-plugin.c planner-0.14.5/src/planner-python-plugin.c
+--- planner-0.14.5.orig/src/planner-python-plugin.c 2009-09-24 11:12:52.000000000 +0100
++++ planner-0.14.5/src/planner-python-plugin.c 2009-09-24 11:31:06.000000000 +0100
+@@ -125,26 +125,15 @@
}
}
--G_MODULE_EXPORT void
--plugin_init (PlannerPlugin *plugin, PlannerWindow *main_window)
+-G_MODULE_EXPORT void
+-plugin_init (PlannerPlugin *plugin)
+static void
-+plugin_execute_scripts(const gchar *dirname)
++plugin_execute_scripts(PlannerPlugin *plugin, const gchar *dirname)
{
- PlannerPluginPriv *priv;
GDir *dir;
- gchar *dirname, *full_filename;
+ gchar *full_filename;
const gchar *filename;
--
+
- priv = g_new0 (PlannerPluginPriv, 1);
- plugin->priv = priv;
-
-- priv->main_window = main_window;
- priv->scripts = g_hash_table_new (g_str_hash, g_str_equal);
--
+-
- Py_Initialize ();
--
+-
- /* Look in ~/.gnome2/planner/python/ and run the scripts that we find */
- dirname = g_build_filename (g_get_home_dir(), ".gnome2", "planner", "python", NULL);
dir = g_dir_open (dirname, 0, NULL);
@@ -107,64 +106,70 @@ diff -ru planner-0.14.4.orig/src/planner-python-plugin.c planner-0.14.4/src/plan
return;
}
-@@ -162,11 +149,35 @@
- filename = g_dir_read_name (dir);
- }
-
-- g_free (dirname);
- g_dir_close (dir);
+@@ -152,7 +141,7 @@
+ while (filename != NULL) {
+ if (g_str_has_suffix (filename, ".py")) {
+ full_filename = g_build_filename (dirname, filename, NULL);
+- python_plugin_execute (full_filename, plugin->main_window, priv->scripts);
++ python_plugin_execute (full_filename, plugin->main_window, plugin->priv->scripts);
+ g_free (full_filename);
+ }
+
+@@ -164,6 +153,33 @@
}
- G_MODULE_EXPORT void
-+plugin_init (PlannerPlugin *plugin, PlannerWindow *main_window)
+ G_MODULE_EXPORT void
++plugin_init (PlannerPlugin *plugin)
+{
+ PlannerPluginPriv *priv;
++ GDir *dir;
+ gchar *dirname;
-+
++ const gchar *filename;
++
+ priv = g_new0 (PlannerPluginPriv, 1);
+ plugin->priv = priv;
+
-+ priv->main_window = main_window;
+ priv->scripts = g_hash_table_new (g_str_hash, g_str_equal);
-+
++
+ Py_Initialize ();
+
+ /* Look in $XDG_DATA_HOME/planner/python/ and run the scripts that we find */
+ dirname = g_build_filename (g_get_user_data_dir(), "planner", "python", NULL);
-+ plugin_execute_scripts(dirname);
++ plugin_execute_scripts(plugin, dirname);
+ g_free (dirname);
+
-+ /* Look in legacy ~/.gnome2/planner/python/ and run the scripts that we find */
++
++ /* Look in ~/.gnome2/planner/python/ and run the scripts that we find */
+ dirname = g_build_filename (g_get_home_dir(), ".gnome2", "planner", "python", NULL);
-+ plugin_execute_scripts(dirname);
++ plugin_execute_scripts(plugin, dirname);
+ g_free (dirname);
+}
+
-+G_MODULE_EXPORT void
- plugin_exit (PlannerPlugin *plugin)
++G_MODULE_EXPORT void
+ plugin_exit (PlannerPlugin *plugin)
{
- Py_Finalize ();
-diff -ru planner-0.14.4.orig/src/planner-window.c planner-0.14.4/src/planner-window.c
---- planner-0.14.4.orig/src/planner-window.c 2009-09-24 11:12:52.000000000 +0100
-+++ planner-0.14.4/src/planner-window.c 2009-09-24 11:18:11.000000000 +0100
-@@ -1066,7 +1066,7 @@
+ PlannerPluginPriv *priv;
+diff -ru planner-0.14.5.orig/src/planner-window.c planner-0.14.5/src/planner-window.c
+--- planner-0.14.5.orig/src/planner-window.c 2009-09-24 11:12:52.000000000 +0100
++++ planner-0.14.5/src/planner-window.c 2009-09-24 11:18:11.000000000 +0100
+@@ -850,7 +850,7 @@
last_dir = planner_conf_get_string (CONF_LAST_DIR, NULL);
-
+
if (last_dir == NULL) {
- last_dir = g_strdup (g_get_home_dir ());
+ last_dir = g_strdup (g_get_user_special_dir (G_USER_DIRECTORY_DOCUMENTS));
}
-
+
return last_dir;
-diff -ru planner-0.14.4.orig/src/planner-xml-planner-plugin.c planner-0.14.4/src/planner-xml-planner-plugin.c
---- planner-0.14.4.orig/src/planner-xml-planner-plugin.c 2009-09-24 11:12:52.000000000 +0100
-+++ planner-0.14.4/src/planner-xml-planner-plugin.c 2009-09-24 11:19:05.000000000 +0100
+diff -ru planner-0.14.5.orig/src/planner-xml-planner-plugin.c planner-0.14.5/src/planner-xml-planner-plugin.c
+--- planner-0.14.5.orig/src/planner-xml-planner-plugin.c 2009-09-24 11:12:52.000000000 +0100
++++ planner-0.14.5/src/planner-xml-planner-plugin.c 2009-09-24 11:19:05.000000000 +0100
@@ -63,7 +63,7 @@
-
+
last_dir = planner_conf_get_string (CONF_MAIN_LAST_XML_EXPORT_DIR, NULL);
if (last_dir == NULL) {
- last_dir = g_strdup (g_get_home_dir ());
+ last_dir = g_strdup (g_get_user_special_dir (G_USER_DIRECTORY_DOCUMENTS));
}
-
+
return last_dir;
diff --git a/planner-gnome596966-editoninsert.patch b/planner-gnome596966-editoninsert.patch
index d5ea177..16d7dfa 100644
--- a/planner-gnome596966-editoninsert.patch
+++ b/planner-gnome596966-editoninsert.patch
@@ -1,15 +1,15 @@
-diff -ru planner-0.14.4.orig/src/planner-task-tree.c planner-0.14.4/src/planner-task-tree.c
---- planner-0.14.4.orig/src/planner-task-tree.c 2009-09-30 16:27:53.000000000 +0100
-+++ planner-0.14.4/src/planner-task-tree.c 2009-09-30 16:28:25.000000000 +0100
+diff -ru planner-0.14.5.orig/src/planner-task-tree.c planner-0.14.5/src/planner-task-tree.c
+--- planner-0.14.5.orig/src/planner-task-tree.c 2009-09-30 16:27:53.000000000 +0100
++++ planner-0.14.5/src/planner-task-tree.c 2009-09-30 16:28:25.000000000 +0100
@@ -2700,7 +2700,7 @@
gtk_tree_view_set_cursor (tree_view,
path,
gtk_tree_view_get_column (tree_view, 0),
- FALSE);
+ TRUE);
-
+
planner_task_tree_set_anchor (tree, path);
-
+
@@ -2788,7 +2788,7 @@
gtk_tree_view_set_cursor (tree_view,
path,
diff --git a/planner-gnome603693-planner-calendar-for-edittask.patch b/planner-gnome603693-planner-calendar-for-edittask.patch
index 1e036bd..6ad3196 100644
--- a/planner-gnome603693-planner-calendar-for-edittask.patch
+++ b/planner-gnome603693-planner-calendar-for-edittask.patch
@@ -1,6 +1,6 @@
-diff -ru planner-0.14.4.orig/data/glade/task-date-widget.glade planner-0.14.4/data/glade/task-date-widget.glade
---- planner-0.14.4.orig/data/glade/task-date-widget.glade 2009-12-03 10:50:00.000000000 +0000
-+++ planner-0.14.4/data/glade/task-date-widget.glade 2009-12-03 11:07:46.000000000 +0000
+diff -ru planner-0.14.5.orig/data/glade/task-date-widget.glade planner-0.14.5/data/glade/task-date-widget.glade
+--- planner-0.14.5.orig/data/glade/task-date-widget.glade 2009-12-03 10:50:00.000000000 +0000
++++ planner-0.14.5/data/glade/task-date-widget.glade 2009-12-03 11:07:46.000000000 +0000
@@ -25,10 +27,12 @@
<property name="spacing">6</property>
@@ -17,12 +17,12 @@ diff -ru planner-0.14.4.orig/data/glade/task-date-widget.glade planner-0.14.4/da
</widget>
<packing>
<property name="padding">0</property>
-diff -ru planner-0.14.4.orig/src/planner-calendar.c planner-0.14.4/src/planner-calendar.c
---- planner-0.14.4.orig/src/planner-calendar.c 2009-12-03 10:50:00.000000000 +0000
-+++ planner-0.14.4/src/planner-calendar.c 2009-12-03 12:00:44.000000000 +0000
+diff -ru planner-0.14.5.orig/src/planner-calendar.c planner-0.14.5/src/planner-calendar.c
+--- planner-0.14.5.orig/src/planner-calendar.c 2009-12-03 10:50:00.000000000 +0000
++++ planner-0.14.5/src/planner-calendar.c 2009-12-03 12:00:44.000000000 +0000
@@ -2782,5 +2782,38 @@
}
- }
+ }
+void
+planner_calendar_mark_days (PlannerCalendar *calendar,
@@ -59,21 +59,20 @@ diff -ru planner-0.14.4.orig/src/planner-calendar.c planner-0.14.4/src/planner-c
+ }
+ mrp_time2_free (t);
+}
-diff -ru planner-0.14.4.orig/src/planner-calendar-dialog.c planner-0.14.4/src/planner-calendar-dialog.c
---- planner-0.14.4.orig/src/planner-calendar-dialog.c 2009-12-03 10:50:00.000000000 +0000
-+++ planner-0.14.4/src/planner-calendar-dialog.c 2009-12-03 11:31:26.000000000 +0000
-@@ -876,10 +876,6 @@
- {
+diff -ru planner-0.14.5.orig/src/planner-calendar-dialog.c planner-0.14.5/src/planner-calendar-dialog.c
+--- planner-0.14.5.orig/src/planner-calendar-dialog.c 2009-12-03 10:50:00.000000000 +0000
++++ planner-0.14.5/src/planner-calendar-dialog.c 2009-12-03 11:31:26.000000000 +0000
+@@ -877,9 +877,6 @@
MrpCalendar *calendar;
PlannerCalendar *calendar_widget;
-- guint y, m, d;
+ guint y, m, d;
- MrpDay *day;
- MrpTime *t;
- mrptime time;
-
+
calendar = cal_dialog_get_selected_calendar (GTK_TREE_VIEW (data->tree_view));
if (!calendar) {
-@@ -895,31 +891,7 @@
+@@ -895,31 +892,7 @@
gtk_widget_set_sensitive (data->default_week_button, TRUE);
gtk_widget_set_sensitive (data->working_time_button, TRUE);
@@ -106,13 +105,13 @@ diff -ru planner-0.14.4.orig/src/planner-calendar-dialog.c planner-0.14.4/src/pl
}
static void
-diff -ru planner-0.14.4.orig/src/planner-calendar.h planner-0.14.4/src/planner-calendar.h
---- planner-0.14.4.orig/src/planner-calendar.h 2009-12-03 10:50:00.000000000 +0000
-+++ planner-0.14.4/src/planner-calendar.h 2009-12-03 12:00:03.000000000 +0000
+diff -ru planner-0.14.5.orig/src/planner-calendar.h planner-0.14.5/src/planner-calendar.h
+--- planner-0.14.5.orig/src/planner-calendar.h 2009-12-03 10:50:00.000000000 +0000
++++ planner-0.14.5/src/planner-calendar.h 2009-12-03 12:00:03.000000000 +0000
@@ -31,6 +31,7 @@
#include <gdk/gdk.h>
- #include <gtk/gtkwidget.h>
+ #include <gtk/gtk.h>
+#include <libplanner/mrp-calendar.h>
#define PLANNER_TYPE_CALENDAR (planner_calendar_get_type ())
@@ -126,9 +125,9 @@ diff -ru planner-0.14.4.orig/src/planner-calendar.h planner-0.14.4/src/planner-c
+
#endif /* __PLANNER_CALENDAR_H__ */
-diff -ru planner-0.14.4.orig/src/planner-task-date-widget.c planner-0.14.4/src/planner-task-date-widget.c
---- planner-0.14.4.orig/src/planner-task-date-widget.c 2009-12-03 10:50:00.000000000 +0000
-+++ planner-0.14.4/src/planner-task-date-widget.c 2009-12-03 12:13:05.000000000 +0000
+diff -ru planner-0.14.5.orig/src/planner-task-date-widget.c planner-0.14.5/src/planner-task-date-widget.c
+--- planner-0.14.5.orig/src/planner-task-date-widget.c 2009-12-03 10:50:00.000000000 +0000
++++ planner-0.14.5/src/planner-task-date-widget.c 2009-12-03 12:13:05.000000000 +0000
@@ -27,6 +27,7 @@
#include "libplanner/mrp-task.h"
#include "libplanner/mrp-paths.h"
@@ -145,7 +144,7 @@ diff -ru planner-0.14.4.orig/src/planner-task-date-widget.c planner-0.14.4/src/p
} PlannerTaskDateWidgetPriv;
-@@ -130,6 +132,29 @@
+@@ -128,6 +130,29 @@
g_signal_emit (widget, signals[DATE_SELECTED], 0);
}
@@ -175,15 +174,15 @@ diff -ru planner-0.14.4.orig/src/planner-task-date-widget.c planner-0.14.4/src/p
static gboolean
grab_on_window (GdkWindow *window,
guint32 time)
-@@ -160,6 +185,7 @@
-
+@@ -158,6 +183,7 @@
+
type = planner_task_date_widget_get_constraint_type (widget);
gtk_widget_set_sensitive (priv->calendar, type != MRP_CONSTRAINT_ASAP);
+ update_schedule_calendar_cb (PLANNER_CALENDAR (priv->calendar), widget);
/* A bit hackish. Grab focus on the popup widget again when the combo
* has been used, since focus is transferred to the combo when it's
-@@ -170,6 +196,22 @@
+@@ -168,6 +194,22 @@
}
}
@@ -206,7 +205,7 @@ diff -ru planner-0.14.4.orig/src/planner-task-date-widget.c planner-0.14.4/src/p
static void
task_date_widget_setup (PlannerTaskDateWidget *widget)
{
-@@ -182,6 +224,8 @@
+@@ -180,6 +222,8 @@
priv = GET_PRIV (widget);
@@ -215,7 +214,7 @@ diff -ru planner-0.14.4.orig/src/planner-task-date-widget.c planner-0.14.4/src/p
vbox = gtk_vbox_new (FALSE, 0);
gtk_container_add (GTK_CONTAINER (widget), vbox);
-@@ -224,6 +268,10 @@
+@@ -222,6 +266,10 @@
G_CALLBACK (task_date_day_selected_double_click_cb),
widget);
@@ -226,7 +225,7 @@ diff -ru planner-0.14.4.orig/src/planner-task-date-widget.c planner-0.14.4/src/p
gtk_widget_show_all (vbox);
}
-@@ -239,8 +287,8 @@
+@@ -237,8 +285,8 @@
return;
}
@@ -237,22 +236,22 @@ diff -ru planner-0.14.4.orig/src/planner-task-date-widget.c planner-0.14.4/src/p
}
mrptime
-@@ -251,7 +299,7 @@
+@@ -249,7 +297,7 @@
priv = GET_PRIV (widget);
-
+
- gtk_calendar_get_date (GTK_CALENDAR (priv->calendar),
-+ planner_calendar_get_date (PLANNER_CALENDAR (priv->calendar),
++ planner_calendar_get_date (GTK_CALENDAR (priv->calendar),
&year, &month, &day);
-
+
month++;
-diff -ru planner-0.14.4.orig/src/planner-task-date-widget.h planner-0.14.4/src/planner-task-date-widget.h
---- planner-0.14.4.orig/src/planner-task-date-widget.h 2009-12-03 10:50:00.000000000 +0000
-+++ planner-0.14.4/src/planner-task-date-widget.h 2009-12-03 12:00:18.000000000 +0000
+diff -ru planner-0.14.5.orig/src/planner-task-date-widget.h planner-0.14.5/src/planner-task-date-widget.h
+--- planner-0.14.5.orig/src/planner-task-date-widget.h 2009-12-03 10:50:00.000000000 +0000
++++ planner-0.14.5/src/planner-task-date-widget.h 2009-12-03 12:00:18.000000000 +0000
@@ -22,6 +22,7 @@
#define __PLANNER_TASK_DATE_WIDGET_H__
- #include <gtk/gtktogglebutton.h>
+ #include <gtk/gtk.h>
+#include <libplanner/mrp-calendar.h>
#define PLANNER_TYPE_TASK_DATE_WIDGET (planner_task_date_widget_get_type ())
@@ -265,9 +264,9 @@ diff -ru planner-0.14.4.orig/src/planner-task-date-widget.h planner-0.14.4/src/p
+ MrpCalendar *calendar);
#endif /* __PLANNER_TASK_DATE_WIDGET_H__ */
-diff -ru planner-0.14.4.orig/src/planner-task-dialog.c planner-0.14.4/src/planner-task-dialog.c
---- planner-0.14.4.orig/src/planner-task-dialog.c 2009-12-03 10:50:00.000000000 +0000
-+++ planner-0.14.4/src/planner-task-dialog.c 2009-12-03 12:01:17.000000000 +0000
+diff -ru planner-0.14.5.orig/src/planner-task-dialog.c planner-0.14.5/src/planner-task-dialog.c
+--- planner-0.14.5.orig/src/planner-task-dialog.c 2009-12-03 10:50:00.000000000 +0000
++++ planner-0.14.5/src/planner-task-dialog.c 2009-12-03 12:01:17.000000000 +0000
@@ -2276,6 +2276,8 @@
{
GtkWidget *widget;
diff --git a/planner-gnome604169-comboboxentry.patch b/planner-gnome604169-comboboxentry.patch
index 7ff14ce..d3b4b75 100644
--- a/planner-gnome604169-comboboxentry.patch
+++ b/planner-gnome604169-comboboxentry.patch
@@ -90,7 +90,7 @@ diff -ru planner-0.14.4.orig/data/glade/add-predecessor.glade planner-0.14.4/dat
diff -ru planner-0.14.4.orig/src/planner-gantt-model.c planner-0.14.4/src/planner-gantt-model.c
--- planner-0.14.4.orig/src/planner-gantt-model.c 2010-01-25 09:50:30.000000000 +0000
+++ planner-0.14.4/src/planner-gantt-model.c 2010-01-25 10:14:59.000000000 +0000
-@@ -1139,28 +1139,12 @@
+@@ -1128,28 +1128,12 @@
return sibling->data;
}
@@ -111,18 +111,18 @@ diff -ru planner-0.14.4.orig/src/planner-gantt-model.c planner-0.14.4/src/planne
- if (!cache->wbs) {
- goto update_cache;
- }
--
+-
- if (cache->wbs_stamp != model->priv->wbs_stamp) {
- goto update_cache;
- }
-
- return cache->wbs;
--
+-
- update_cache:
string = g_string_sized_new (24);
pos = -1;
-@@ -1182,10 +1166,29 @@
+@@ -1171,10 +1155,29 @@
if (mrp_task_get_parent (tmp_task) == NULL)
break;
}
@@ -135,7 +135,8 @@ diff -ru planner-0.14.4.orig/src/planner-gantt-model.c planner-0.14.4/src/planne
+ MrpTask *task)
+{
+ ValueCache *cache;
-+
+
+- cache->wbs = g_string_free (string, FALSE);
+ cache = value_cache_get (model, task);
+ if (!cache->wbs) {
+ goto update_cache;
@@ -144,15 +145,14 @@ diff -ru planner-0.14.4.orig/src/planner-gantt-model.c planner-0.14.4/src/planne
+ if (cache->wbs_stamp != model->priv->wbs_stamp) {
+ goto update_cache;
+ }
-
-- cache->wbs = g_string_free (string, FALSE);
++
+ return cache->wbs;
+
+ update_cache:
+ g_free (cache->wbs);
+ cache->wbs = get_wbs_from_task(task);
cache->wbs_stamp = model->priv->wbs_stamp;
-
+
return cache->wbs;
diff -ru planner-0.14.4.orig/src/planner-task-dialog.c planner-0.14.4/src/planner-task-dialog.c
--- planner-0.14.4.orig/src/planner-task-dialog.c 2010-01-25 10:27:21.000000000 +0000
@@ -193,11 +193,11 @@ diff -ru planner-0.14.4.orig/src/planner-task-dialog.c planner-0.14.4/src/planne
+ GtkCellRenderer *renderer;
+ GList *l;
+ const gchar *name;
-
+
if (tasks == NULL) {
return;
}
-
+
- strings = NULL;
+ store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_POINTER);
for (l = tasks; l; l = l->next) {
@@ -237,15 +237,15 @@ diff -ru planner-0.14.4.orig/src/planner-task-dialog.c planner-0.14.4/src/planne
- strings = g_list_reverse (strings);
- gtk_combo_set_popdown_strings (combo, strings);
- g_list_free (strings);
--
+-
- g_object_set_data (G_OBJECT (combo), "selected_task", tasks->data);
--
+-
- children = GTK_LIST (combo->list)->children;
- for (l = children; l; l = l->next) {
- g_object_set_data (G_OBJECT (l->data), "task", tasks->data);
- tasks = tasks->next;
- }
--
+-
- g_signal_connect (combo->list,
- "select-child",
- G_CALLBACK (task_dialog_task_combo_select_child_cb),
@@ -260,26 +260,26 @@ diff -ru planner-0.14.4.orig/src/planner-task-dialog.c planner-0.14.4/src/planne
static gboolean
@@ -1906,7 +1907,7 @@
-
+
tasks = mrp_project_get_all_tasks (project);
tasks = g_list_remove (tasks, task);
- task_dialog_setup_task_combo (GTK_COMBO (w), tasks);
+ task_dialog_setup_task_combo (GTK_COMBO_BOX_ENTRY (w), tasks);
-
+
w = glade_xml_get_widget (glade, "type_optionmenu");
g_object_set_data (G_OBJECT (dialog), "type_optionmenu", w);
@@ -1947,10 +1948,11 @@
GtkWidget *w;
GError *error = NULL;
MrpTask *task_main;
-- MrpTask *new_task_pred;
+- MrpTask *new_task_pred;
+ MrpTask *new_task_pred=NULL;
- MrpProject *project;
+ MrpProject *project;
gint lag;
- gint pred_type;
+ gint pred_type;
+ GtkTreeIter iter;
const gchar *str;
-
+
main_window = g_object_get_data (G_OBJECT (dialog), "main_window");
@@ -1970,7 +1972,11 @@
/* Predecessor task. */
diff --git a/planner-gnome604510.calcolors.patch b/planner-gnome604510.calcolors.patch
index fee506f..fde99c2 100644
--- a/planner-gnome604510.calcolors.patch
+++ b/planner-gnome604510.calcolors.patch
@@ -1,7 +1,7 @@
diff -ru planner-0.14.4.orig/libplanner/mrp-calendar.c planner-0.14.4/libplanner/mrp-calendar.c
--- planner-0.14.4.orig/libplanner/mrp-calendar.c 2008-07-22 14:41:46.000000000 +0100
+++ planner-0.14.4/libplanner/mrp-calendar.c 2009-12-12 17:08:50.000000000 +0000
-@@ -159,9 +161,10 @@
+@@ -159,9 +159,10 @@
g_object_class_install_property (object_class,
PROP_PROJECT,
@@ -13,7 +13,7 @@ diff -ru planner-0.14.4.orig/libplanner/mrp-calendar.c planner-0.14.4/libplanner
G_PARAM_READWRITE));
imrp_day_setup_defaults ();
-@@ -254,7 +257,7 @@
+@@ -254,7 +255,7 @@
mrp_calendar_set_name (calendar, g_value_get_string (value));
break;
case PROP_PROJECT:
@@ -64,7 +64,7 @@ diff -ru planner-0.14.4.orig/src/planner-calendar.c planner-0.14.4/src/planner-c
{
@@ -470,8 +487,11 @@
calendar->year = 1900 + tm->tm_year;
-
+
for (i=0;i<31;i++)
- calendar->marked_date[i] = PLANNER_CALENDAR_MARK_NONE;
- calendar->num_marked_dates = 0;
@@ -74,8 +74,8 @@ diff -ru planner-0.14.4.orig/src/planner-calendar.c planner-0.14.4/src/planner-c
+ calendar->mark_colors[i] = tango_palette[i];
+
calendar->selected_day = tm->tm_mday;
-
- calendar->display_flags = ( PLANNER_CALENDAR_SHOW_HEADING |
+
+ calendar->display_flags = ( PLANNER_CALENDAR_SHOW_HEADING |
@@ -1049,6 +1069,7 @@
PlannerCalendarPrivateData *private_data;
GdkWindowAttr attributes;
@@ -94,7 +94,7 @@ diff -ru planner-0.14.4.orig/src/planner-calendar.c planner-0.14.4/src/planner-c
}
static void
-@@ -1839,51 +1863,13 @@
+@@ -1839,49 +1863,11 @@
gdk_draw_rectangle (private_data->main_win, gc, TRUE, x_left, y_top,
private_data->day_width, day_height);
}
@@ -121,7 +121,7 @@ diff -ru planner-0.14.4.orig/src/planner-calendar.c planner-0.14.4/src/planner-c
- stipple_pattern,
- 4, 4);
- }
--
+-
- gdk_gc_set_foreground (gc, STRIPED_BG_COLOR (GTK_WIDGET (calendar)));
- gdk_gc_set_fill (gc, GDK_STIPPLED);
- gdk_gc_set_stipple (gc, stripe_stipple);
@@ -131,11 +131,8 @@ diff -ru planner-0.14.4.orig/src/planner-calendar.c planner-0.14.4/src/planner-c
- }
- break;
- }
-+ gdk_gc_set_foreground (gc, calendar->marked_date[day-1]);
-+ gdk_draw_rectangle (private_data->main_win, gc, TRUE, x_left, y_top,
-+ private_data->day_width, day_height);
- }
-
+- }
+-
- switch (calendar->marked_date[day-1]) {
- case PLANNER_CALENDAR_MARK_BOLD:
- gdk_gc_set_foreground (gc, MARKED_COLOR (GTK_WIDGET (calendar)));
@@ -145,27 +142,28 @@ diff -ru planner-0.14.4.orig/src/planner-calendar.c planner-0.14.4/src/planner-c
- case PLANNER_CALENDAR_MARK_NONE:
- gdk_gc_set_foreground (gc, NORMAL_DAY_COLOR (GTK_WIDGET (calendar)));
- break;
-- }
--
++ gdk_gc_set_foreground (gc, calendar->marked_date[day-1]);
++ gdk_draw_rectangle (private_data->main_win, gc, TRUE, x_left, y_top,
++ private_data->day_width, day_height);
+ }
+
if (calendar->selected_day == day)
- gdk_gc_set_foreground (gc, SELECTED_FG_COLOR (GTK_WIDGET (calendar)));
- else
@@ -1901,17 +1887,6 @@
gdk_draw_layout (private_data->main_win, gc,
x_loc, y_loc, layout);
- switch (calendar->marked_date[day-1]) {
- case PLANNER_CALENDAR_MARK_BOLD:
-- if (calendar->day_month[row][col] == MONTH_CURRENT)
+- if (calendar->day_month[row][col] == MONTH_CURRENT)
- gdk_draw_layout (private_data->main_win, gc,
- x_loc-1, y_loc, layout);
- break;
--
+-
- default:
- break;
- }
-
- if (GTK_WIDGET_HAS_FOCUS (calendar)
+ if (GTK_WIDGET_HAS_FOCUS (calendar)
&& calendar->focus_row == row && calendar->focus_col == col)
{
@@ -2257,46 +2232,6 @@
@@ -175,16 +173,16 @@ diff -ru planner-0.14.4.orig/src/planner-calendar.c planner-0.14.4/src/planner-c
-planner_calendar_clear_marks (PlannerCalendar *calendar)
-{
- guint day;
--
+-
- g_return_if_fail (PLANNER_IS_CALENDAR (calendar));
--
+-
- for (day = 0; day < 31; day++)
- {
- calendar->marked_date[day] = PLANNER_CALENDAR_MARK_NONE;
- }
--
+-
- calendar->num_marked_dates = 0;
--
+-
- if (GTK_WIDGET_DRAWABLE (calendar))
- {
- planner_calendar_paint_main (GTK_WIDGET (calendar));
@@ -196,18 +194,18 @@ diff -ru planner-0.14.4.orig/src/planner-calendar.c planner-0.14.4/src/planner-c
- guint day)
-{
- g_return_val_if_fail (PLANNER_IS_CALENDAR (calendar), FALSE);
--
+-
- if (day >= 1 && day <= 31 && calendar->marked_date[day-1] == TRUE)
- {
- calendar->marked_date[day - 1] = FALSE;
- calendar->num_marked_dates--;
- }
--
+-
- if (GTK_WIDGET_DRAWABLE (GTK_WIDGET (calendar)))
- {
- planner_calendar_paint_main (GTK_WIDGET (calendar));
- }
--
+-
- return TRUE;
-}
-
@@ -227,11 +225,11 @@ diff -ru planner-0.14.4.orig/src/planner-calendar.c planner-0.14.4/src/planner-c
+ const GdkColor *color)
{
gint index;
-
+
@@ -2766,16 +2701,11 @@
index = day - 1;
-
+
- if (calendar->marked_date[index] == type) {
+ if (calendar->marked_date[index] == color) {
return;
@@ -325,14 +323,14 @@ diff -ru planner-0.14.4.orig/src/planner-calendar.h planner-0.14.4/src/planner-c
@@ -75,10 +66,9 @@
gint day_month[6][7];
gint day[6][7];
-
+
- gint num_marked_dates;
- gint marked_date[31];
+ const GdkColor *marked_date[31];
PlannerCalendarDisplayOptions display_flags;
- GdkColor marked_date_color[31];
+ GdkColor mark_colors[14];
-
+
GdkGC *gc;
GdkGC *xor_gc;
@@ -123,10 +113,6 @@
diff --git a/planner-gnome604531-tooltips.patch b/planner-gnome604531-tooltips.patch
index ca3553b..2e479be 100644
--- a/planner-gnome604531-tooltips.patch
+++ b/planner-gnome604531-tooltips.patch
@@ -1,7 +1,7 @@
-diff -ru planner-0.14.4.orig/src/planner-gantt-chart.c planner-0.14.4/src/planner-gantt-chart.c
---- planner-0.14.4.orig/src/planner-gantt-chart.c 2009-12-14 10:29:48.000000000 +0000
-+++ planner-0.14.4/src/planner-gantt-chart.c 2009-12-14 12:38:26.000000000 +0000
-@@ -369,6 +369,7 @@
+diff -ru planner-0.14.5.orig/src/planner-gantt-chart.c planner-0.14.5/src/planner-gantt-chart.c
+--- planner-0.14.5.orig/src/planner-gantt-chart.c 2009-12-14 10:29:48.000000000 +0000
++++ planner-0.14.5/src/planner-gantt-chart.c 2009-12-14 12:38:26.000000000 +0000
+@@ -366,6 +366,7 @@
0); /* padding */
priv->canvas = GNOME_CANVAS (gnome_canvas_new ());
@@ -9,10 +9,10 @@ diff -ru planner-0.14.4.orig/src/planner-gantt-chart.c planner-0.14.4/src/planne
priv->canvas->close_enough = 5;
gnome_canvas_set_center_scroll_region (priv->canvas, FALSE);
-diff -ru planner-0.14.4.orig/src/planner-gantt-chart.h planner-0.14.4/src/planner-gantt-chart.h
---- planner-0.14.4.orig/src/planner-gantt-chart.h 2009-12-14 10:29:48.000000000 +0000
-+++ planner-0.14.4/src/planner-gantt-chart.h 2009-12-14 12:38:26.000000000 +0000
-@@ -104,5 +104,7 @@
+diff -ru planner-0.14.5.orig/src/planner-gantt-chart.h planner-0.14.5/src/planner-gantt-chart.h
+--- planner-0.14.5.orig/src/planner-gantt-chart.h 2009-12-14 10:29:48.000000000 +0000
++++ planner-0.14.5/src/planner-gantt-chart.h 2009-12-14 12:38:26.000000000 +0000
+@@ -102,5 +102,7 @@
gboolean
planner_gantt_chart_get_nonstandard_days (PlannerGanttChart *chart);
@@ -20,11 +20,11 @@ diff -ru planner-0.14.4.orig/src/planner-gantt-chart.h planner-0.14.4/src/planne
+planner_gantt_chart_init_tooltips (GnomeCanvas *canvas);
#endif /* __PLANNER_GANTT_CHART_H__ */
-diff -ru planner-0.14.4.orig/src/planner-gantt-row.c planner-0.14.4/src/planner-gantt-row.c
---- planner-0.14.4.orig/src/planner-gantt-row.c 2009-12-14 10:29:48.000000000 +0000
-+++ planner-0.14.4/src/planner-gantt-row.c 2009-12-14 12:42:52.000000000 +0000
-@@ -3497,3 +3497,50 @@
-
+diff -ru planner-0.14.5.orig/src/planner-gantt-row.c planner-0.14.5/src/planner-gantt-row.c
+--- planner-0.14.5.orig/src/planner-gantt-row.c 2009-12-14 10:29:48.000000000 +0000
++++ planner-0.14.5/src/planner-gantt-row.c 2009-12-14 12:42:52.000000000 +0000
+@@ -3518,3 +3518,50 @@
+
return list;
}
+
@@ -74,21 +74,21 @@ diff -ru planner-0.14.4.orig/src/planner-gantt-row.c planner-0.14.4/src/planner-
+ G_CALLBACK (query_tooltip_canvas_cb),
+ NULL );
+}
-diff -ru planner-0.14.4.orig/src/planner-usage-chart.c planner-0.14.4/src/planner-usage-chart.c
---- planner-0.14.4.orig/src/planner-usage-chart.c 2009-12-14 10:29:48.000000000 +0000
-+++ planner-0.14.4/src/planner-usage-chart.c 2009-12-14 12:38:26.000000000 +0000
+diff -ru planner-0.14.5.orig/src/planner-usage-chart.c planner-0.14.5/src/planner-usage-chart.c
+--- planner-0.14.5.orig/src/planner-usage-chart.c 2009-12-14 10:29:48.000000000 +0000
++++ planner-0.14.5/src/planner-usage-chart.c 2009-12-14 12:38:26.000000000 +0000
@@ -341,6 +341,7 @@
- 0);
+ 0);
- priv->canvas = GNOME_CANVAS (gnome_canvas_new ());
-+ planner_usage_chart_init_tooltips(priv->canvas);
- priv->canvas->close_enough = 5;
- gnome_canvas_set_center_scroll_region (priv->canvas, FALSE);
+ priv->canvas = GNOME_CANVAS (gnome_canvas_new ());
++ planner_usage_chart_init_tooltips(priv->canvas);
+ priv->canvas->close_enough = 5;
+ gnome_canvas_set_center_scroll_region (priv->canvas, FALSE);
-diff -ru planner-0.14.4.orig/src/planner-usage-chart.h planner-0.14.4/src/planner-usage-chart.h
---- planner-0.14.4.orig/src/planner-usage-chart.h 2009-12-14 10:29:48.000000000 +0000
-+++ planner-0.14.4/src/planner-usage-chart.h 2009-12-14 12:38:26.000000000 +0000
-@@ -81,4 +81,7 @@
+diff -ru planner-0.14.5.orig/src/planner-usage-chart.h planner-0.14.5/src/planner-usage-chart.h
+--- planner-0.14.5.orig/src/planner-usage-chart.h 2009-12-14 10:29:48.000000000 +0000
++++ planner-0.14.5/src/planner-usage-chart.h 2009-12-14 12:38:26.000000000 +0000
+@@ -79,4 +79,7 @@
void planner_usage_chart_setup_root_task (PlannerUsageChart *chart);
@@ -96,9 +96,9 @@ diff -ru planner-0.14.4.orig/src/planner-usage-chart.h planner-0.14.4/src/planne
+planner_usage_chart_init_tooltips (GnomeCanvas *canvas);
+
#endif /* __PLANNER_USAGE_CHART_H__ */
-diff -ru planner-0.14.4.orig/src/planner-usage-row.c planner-0.14.4/src/planner-usage-row.c
---- planner-0.14.4.orig/src/planner-usage-row.c 2009-12-14 10:29:48.000000000 +0000
-+++ planner-0.14.4/src/planner-usage-row.c 2009-12-14 12:42:48.000000000 +0000
+diff -ru planner-0.14.5.orig/src/planner-usage-row.c planner-0.14.5/src/planner-usage-row.c
+--- planner-0.14.5.orig/src/planner-usage-row.c 2009-12-14 10:29:48.000000000 +0000
++++ planner-0.14.5/src/planner-usage-row.c 2009-12-14 12:42:48.000000000 +0000
@@ -1632,3 +1632,50 @@
return FALSE;
diff --git a/planner-gnome606824-notecolumn.patch b/planner-gnome606824-notecolumn.patch
index 64a6618..5fd82a4 100644
--- a/planner-gnome606824-notecolumn.patch
+++ b/planner-gnome606824-notecolumn.patch
@@ -27,7 +27,7 @@ diff -ru planner-0.14.4.orig/src/planner-conf-gconf.c planner-0.14.4/src/planner
+ return ret_val;
+}
+
- gboolean
+ gboolean
planner_conf_set_bool (const gchar *key, gboolean value, GError **error)
{
diff -ru planner-0.14.4.orig/src/planner-conf.h planner-0.14.4/src/planner-conf.h
@@ -46,8 +46,8 @@ diff -ru planner-0.14.4.orig/src/planner-conf.h planner-0.14.4/src/planner-conf.
diff -ru planner-0.14.4.orig/src/planner-gantt-model.c planner-0.14.4/src/planner-gantt-model.c
--- planner-0.14.4.orig/src/planner-gantt-model.c 2008-07-22 14:41:47.000000000 +0100
+++ planner-0.14.4/src/planner-gantt-model.c 2010-01-12 16:59:44.000000000 +0000
-@@ -654,6 +654,8 @@
- return G_TYPE_LONG;
+@@ -653,6 +653,8 @@
+ return G_TYPE_LONG;
case COL_COMPLETE:
return G_TYPE_INT;
+ case COL_NOTE:
@@ -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;
}
-@@ -796,6 +798,7 @@
+@@ -795,6 +797,7 @@
MrpTaskType type;
const gchar *name;
const gchar *cached_str;
+ const gchar *note = NULL;
-
+
g_return_if_fail (iter != NULL);
-@@ -898,6 +901,13 @@
+@@ -897,6 +900,13 @@
break;
@@ -91,7 +91,7 @@ diff -ru planner-0.14.4.orig/src/planner-gantt-model.h planner-0.14.4/src/planne
diff -ru planner-0.14.4.orig/src/planner-gantt-view.c planner-0.14.4/src/planner-gantt-view.c
--- planner-0.14.4.orig/src/planner-gantt-view.c 2010-01-12 15:36:55.000000000 +0000
+++ planner-0.14.4/src/planner-gantt-view.c 2010-01-12 16:59:44.000000000 +0000
-@@ -712,6 +712,7 @@
+@@ -635,6 +635,7 @@
* xgettext:no-c-format
*/
COL_COMPLETE, _("% Complete"),
@@ -102,7 +102,7 @@ diff -ru planner-0.14.4.orig/src/planner-gantt-view.c planner-0.14.4/src/planner
diff -ru planner-0.14.4.orig/src/planner-resource-view.c planner-0.14.4/src/planner-resource-view.c
--- planner-0.14.4.orig/src/planner-resource-view.c 2009-04-07 19:15:08.000000000 +0100
+++ planner-0.14.4/src/planner-resource-view.c 2010-01-12 16:59:44.000000000 +0000
-@@ -185,6 +185,11 @@
+@@ -186,6 +186,11 @@
GtkTreeModel *tree_model,
GtkTreeIter *iter,
gpointer data);
@@ -114,7 +114,7 @@ diff -ru planner-0.14.4.orig/src/planner-resource-view.c planner-0.14.4/src/plan
static void resource_view_popup_menu (GtkWidget *widget,
PlannerView *view);
static void resource_view_edit_resource_cb (GtkAction *action,
-@@ -1335,6 +1340,26 @@
+@@ -1374,6 +1379,26 @@
G_CALLBACK (resource_view_cell_cost_edited),
view);
@@ -140,11 +140,11 @@ diff -ru planner-0.14.4.orig/src/planner-resource-view.c planner-0.14.4/src/plan
+
/*
project = planner_window_get_project (view->main_window);
- properties = mrp_project_get_properties_from_type (project,
-@@ -2287,6 +2312,32 @@
+ properties = mrp_project_get_properties_from_type (project,
+@@ -2326,6 +2351,32 @@
}
- static void
+ static void
+resource_view_note_data_func (GtkTreeViewColumn *tree_column,
+ GtkCellRenderer *cell,
+ GtkTreeModel *tree_model,
@@ -252,7 +252,7 @@ diff -ru planner-0.14.4.orig/src/planner-task-tree.c planner-0.14.4/src/planner-
diff -ru planner-0.14.4.orig/src/planner-task-view.c planner-0.14.4/src/planner-task-view.c
--- planner-0.14.4.orig/src/planner-task-view.c 2008-08-03 13:45:16.000000000 +0100
+++ planner-0.14.4/src/planner-task-view.c 2010-01-12 16:59:44.000000000 +0000
-@@ -348,6 +348,7 @@
+@@ -378,6 +378,7 @@
* xgettext:no-c-format
*/
COL_COMPLETE, _("% Complete"),
diff --git a/planner-gnome615641-multiselect.patch b/planner-gnome615641-multiselect.patch
index 2b7416f..be10809 100644
--- a/planner-gnome615641-multiselect.patch
+++ b/planner-gnome615641-multiselect.patch
@@ -1,6 +1,6 @@
-diff -ru planner-0.14.4.orig/src/planner-calendar.c planner-0.14.4/src/planner-calendar.c
---- planner-0.14.4.orig/src/planner-calendar.c 2010-03-16 11:18:21.000000000 +0000
-+++ planner-0.14.4/src/planner-calendar.c 2010-04-13 13:07:42.000000000 +0100
+diff -ru planner-0.14.5.orig/src/planner-calendar.c planner-0.14.5/src/planner-calendar.c
+--- planner-0.14.5.orig/src/planner-calendar.c 2010-03-16 11:18:21.000000000 +0000
++++ planner-0.14.5/src/planner-calendar.c 2010-04-13 13:07:42.000000000 +0100
@@ -291,7 +291,7 @@
static void planner_calendar_paint_main (GtkWidget *widget);
@@ -27,8 +27,8 @@ diff -ru planner-0.14.4.orig/src/planner-calendar.c planner-0.14.4/src/planner-c
- calendar->selected_day = tm->tm_mday;
+ calendar->selected_days = g_list_append(NULL, GINT_TO_POINTER(tm->tm_mday));
-
- calendar->display_flags = ( PLANNER_CALENDAR_SHOW_HEADING |
+
+ calendar->display_flags = ( PLANNER_CALENDAR_SHOW_HEADING |
PLANNER_CALENDAR_SHOW_DAY_NAMES );
@@ -669,6 +673,24 @@
}
@@ -58,7 +58,7 @@ diff -ru planner-0.14.4.orig/src/planner-calendar.c planner-0.14.4/src/planner-c
@@ -696,17 +718,7 @@
planner_calendar_signals[MONTH_CHANGED_SIGNAL],
0);
-
+
- if (month_len < calendar->selected_day)
- {
- calendar->selected_day = 0;
@@ -75,9 +75,9 @@ diff -ru planner-0.14.4.orig/src/planner-calendar.c planner-0.14.4/src/planner-c
gtk_widget_queue_draw (GTK_WIDGET (calendar));
planner_calendar_thaw (calendar);
@@ -743,13 +755,7 @@
-
+
month_len = month_length[leap (calendar->year)][calendar->month + 1];
-
+
- if (month_len < calendar->selected_day)
- {
- calendar->selected_day = 0;
@@ -89,11 +89,10 @@ diff -ru planner-0.14.4.orig/src/planner-calendar.c planner-0.14.4/src/planner-c
gtk_widget_queue_draw (GTK_WIDGET (calendar));
planner_calendar_thaw (calendar);
-@@ -773,14 +779,8 @@
- 0);
-
+@@ -774,13 +780,7 @@
+
month_len = month_length[leap (calendar->year)][calendar->month + 1];
--
+
- if (month_len < calendar->selected_day)
- {
- calendar->selected_day = 0;
@@ -101,16 +100,14 @@ diff -ru planner-0.14.4.orig/src/planner-calendar.c planner-0.14.4/src/planner-c
- }
- else
- planner_calendar_select_day (calendar, calendar->selected_day);
-+
+ planner_reset_selected_days (calendar, month_len);
-
+
gtk_widget_queue_draw (GTK_WIDGET (calendar));
planner_calendar_thaw (calendar);
-@@ -808,14 +808,8 @@
- 0);
-
+@@ -809,13 +809,7 @@
+
month_len = month_length[leap (calendar->year)][calendar->month + 1];
--
+
- if (month_len < calendar->selected_day)
- {
- calendar->selected_day = 0;
@@ -118,15 +115,14 @@ diff -ru planner-0.14.4.orig/src/planner-calendar.c planner-0.14.4/src/planner-c
- }
- else
- planner_calendar_select_day (calendar, calendar->selected_day);
-+
+ planner_reset_selected_days (calendar, month_len);
-
+
gtk_widget_queue_draw (GTK_WIDGET (calendar));
planner_calendar_thaw (calendar);
@@ -857,7 +851,7 @@
if (!GTK_WIDGET_HAS_FOCUS (widget))
gtk_widget_grab_focus (widget);
-
+
- planner_calendar_select_and_focus_day (calendar, day);
+ planner_calendar_select_and_focus_day (calendar, day, event->state & GDK_CONTROL_MASK);
@@ -141,19 +137,19 @@ diff -ru planner-0.14.4.orig/src/planner-calendar.c planner-0.14.4/src/planner-c
PlannerCalendarPrivateData *private_data;
PangoLayout *layout;
@@ -1829,6 +1824,8 @@
-
+
day = calendar->day[row][col];
-
+
+ is_selected_day = (NULL != g_list_find(calendar->selected_days, GINT_TO_POINTER(day)));
+
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 @@
private_data->day_width, day_height);
}
*/
-- if (calendar->selected_day == day)
+- if (calendar->selected_day == day)
+ if (is_selected_day)
{
gdk_gc_set_foreground (gc, SELECTED_BG_COLOR (GTK_WIDGET (calendar)));
@@ -161,7 +157,7 @@ diff -ru planner-0.14.4.orig/src/planner-calendar.c planner-0.14.4/src/planner-c
@@ -1870,7 +1867,7 @@
private_data->day_width, day_height);
}
-
+
- if (calendar->selected_day == day)
+ if (is_selected_day)
gdk_gc_set_foreground (gc, SELECTED_FG_COLOR (GTK_WIDGET (calendar)));
@@ -176,15 +172,15 @@ diff -ru planner-0.14.4.orig/src/planner-calendar.c planner-0.14.4/src/planner-c
state = GTK_WIDGET_HAS_FOCUS (widget) ? GTK_STATE_SELECTED : GTK_STATE_ACTIVE;
else
state = GTK_STATE_NORMAL;
-
- gtk_paint_focus (widget->style,
+
+ gtk_paint_focus (widget->style,
private_data->main_win,
-- (calendar->selected_day == day)
-- ? GTK_STATE_SELECTED : GTK_STATE_NORMAL,
+- (calendar->selected_day == 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,
+ x_left, y_top,
+ private_data->day_width,
@@ -2171,31 +2167,17 @@
return TRUE;
}
@@ -198,23 +194,22 @@ diff -ru planner-0.14.4.orig/src/planner-calendar.c planner-0.14.4/src/planner-c
{
- g_return_if_fail (PLANNER_IS_CALENDAR (calendar));
g_return_if_fail (day <= 31);
--
+
- /* planner_calendar_compute_days (calendar); */
--
+-
- /* Deselect the old day */
- if (calendar->selected_day > 0)
- {
- gint selected_day;
--
+-
- selected_day = calendar->selected_day;
- calendar->selected_day = 0;
- if (GTK_WIDGET_DRAWABLE (GTK_WIDGET (calendar)))
- planner_calendar_paint_day_num (GTK_WIDGET (calendar), selected_day);
- }
--
+-
- calendar->selected_day = day;
--
-+
+-
/* Select the new day */
- if (day != 0)
+ if (day != 0 && (NULL == g_list_find(calendar->selected_days, GINT_TO_POINTER(day))))
@@ -272,7 +267,7 @@ diff -ru planner-0.14.4.orig/src/planner-calendar.c planner-0.14.4/src/planner-c
if (old_focus_row != -1 && old_focus_col != -1)
planner_calendar_paint_day (GTK_WIDGET (calendar), old_focus_row, old_focus_col);
--
+-
- planner_calendar_select_day (calendar, day);
+
+ if (multiselect)
@@ -302,20 +297,20 @@ diff -ru planner-0.14.4.orig/src/planner-calendar.c planner-0.14.4/src/planner-c
{
- g_return_if_fail (PLANNER_IS_CALENDAR (calendar));
+ g_return_val_if_fail (PLANNER_IS_CALENDAR (calendar), NULL);
-
+
if (year)
*year = calendar->year;
@@ -2245,8 +2273,7 @@
if (month)
*month = calendar->month;
-
+
- if (day)
- *day = calendar->selected_day;
+ return calendar->selected_days;
}
static gboolean
-@@ -2547,10 +2574,15 @@
+@@ -2547,11 +2574,16 @@
static void
planner_calendar_finalize (GObject *object)
{
@@ -324,21 +319,22 @@ diff -ru planner-0.14.4.orig/src/planner-calendar.c planner-0.14.4/src/planner-c
+
+ calendar = PLANNER_CALENDAR (object);
private_data = PLANNER_CALENDAR_PRIVATE_DATA (object);
-
+
g_free (private_data);
-+
+
+ g_list_free(calendar->selected_days);
-
++
if (G_OBJECT_CLASS (parent_class)->finalize)
(* G_OBJECT_CLASS (parent_class)->finalize) (object);
+ }
@@ -2676,7 +2708,7 @@
planner_calendar_set_month_next (calendar);
}
- planner_calendar_select_and_focus_day (calendar, day);
+ planner_calendar_select_and_focus_day (calendar, day, event->state & GDK_CONTROL_MASK);
-
- planner_calendar_thaw (calendar);
+
+ planner_calendar_thaw (calendar);
}
@@ -2725,7 +2757,8 @@
GList *daytypes;
@@ -350,9 +346,9 @@ diff -ru planner-0.14.4.orig/src/planner-calendar.c planner-0.14.4/src/planner-c
g_object_get (mrp_calendar, "project", &project, NULL);
-diff -ru planner-0.14.4.orig/src/planner-calendar-dialog.c planner-0.14.4/src/planner-calendar-dialog.c
---- planner-0.14.4.orig/src/planner-calendar-dialog.c 2010-03-16 11:18:21.000000000 +0000
-+++ planner-0.14.4/src/planner-calendar-dialog.c 2010-04-13 12:53:04.000000000 +0100
+diff -ru planner-0.14.5.orig/src/planner-calendar-dialog.c planner-0.14.5/src/planner-calendar-dialog.c
+--- planner-0.14.5.orig/src/planner-calendar-dialog.c 2010-03-16 11:18:21.000000000 +0000
++++ planner-0.14.5/src/planner-calendar-dialog.c 2010-04-13 12:53:04.000000000 +0100
@@ -823,9 +823,10 @@
DialogData *data)
{
@@ -368,7 +364,7 @@ diff -ru planner-0.14.4.orig/src/planner-calendar-dialog.c planner-0.14.4/src/pl
@@ -842,10 +843,12 @@
return;
}
-
+
- planner_calendar_get_date (PLANNER_CALENDAR (data->calendar), &y, &m, &d);
- t = mrp_time_compose (y, m + 1, d, 0, 0, 0);
- /* mrp_calendar_set_days (calendar, t, day, (mrptime) -1); */
@@ -382,7 +378,7 @@ diff -ru planner-0.14.4.orig/src/planner-calendar-dialog.c planner-0.14.4/src/pl
}
static void
-@@ -943,6 +946,7 @@
+@@ -944,6 +947,7 @@
GList *ivals, *l;
MrpCalendar *calendar, *root;
PlannerCalendar *calendar_widget;
@@ -390,51 +386,45 @@ diff -ru planner-0.14.4.orig/src/planner-calendar-dialog.c planner-0.14.4/src/pl
guint y, m, d;
mrptime t;
gint i;
-@@ -988,54 +992,66 @@
+@@ -989,54 +993,66 @@
calendar_widget = PLANNER_CALENDAR (data->calendar);
-
+
- planner_calendar_get_date (calendar_widget, &y, &m, &d);
- t = mrp_time_compose (y, m + 1, d, 0, 0, 0);
--
+-
- day = mrp_calendar_get_day (calendar, t, FALSE);
-+ days = planner_calendar_get_dates (calendar_widget, &y, &m);
-
+-
- if (day == mrp_day_get_use_base ()) {
- gtk_widget_set_sensitive (data->option_menu, FALSE);
--
++ days = planner_calendar_get_dates (calendar_widget, &y, &m);
+
- gtk_toggle_button_set_active (
- GTK_TOGGLE_BUTTON (data->base_radiobutton), TRUE);
- } else {
+ if (g_list_length(days) > 1) {
+ /*allow multi-selection to control setting multiple days to the same type*/
gtk_widget_set_sensitive (data->option_menu, TRUE);
--
-- cal_dialog_option_menu_set_day (data->option_menu, day);
+- cal_dialog_option_menu_set_day (data->option_menu, day);
+-
gtk_toggle_button_set_active (
- GTK_TOGGLE_BUTTON (data->type_radiobutton), TRUE);
- }
+ GTK_TOGGLE_BUTTON (data->type_radiobutton), TRUE);
- calendar = cal_dialog_get_selected_calendar (GTK_TREE_VIEW (data->tree_view));
--
-- if (day == mrp_day_get_use_base ()) {
-- day = mrp_calendar_get_day (calendar, t, TRUE);
-- }
--
-- ivals = mrp_calendar_day_get_intervals (calendar, day, TRUE);
+ gtk_widget_set_sensitive (data->apply_button, TRUE);
+ } else {
+ d = GPOINTER_TO_INT(days->data);
+ t = mrp_time_compose (y, m + 1, d, 0, 0, 0);
-
-- for (i = 0; i < 5; i++) {
-- gtk_entry_set_text (GTK_ENTRY (data->from_entry[i]), "");
-- gtk_entry_set_text (GTK_ENTRY (data->to_entry[i]), "");
+
+- if (day == mrp_day_get_use_base ()) {
+- day = mrp_calendar_get_day (calendar, t, TRUE);
- }
+ day = mrp_calendar_get_day (calendar, t, FALSE);
-+
+
+- ivals = mrp_calendar_day_get_intervals (calendar, day, TRUE);
+ if (day == mrp_day_get_use_base ()) {
+ gtk_widget_set_sensitive (data->option_menu, FALSE);
+
@@ -444,26 +434,29 @@ diff -ru planner-0.14.4.orig/src/planner-calendar-dialog.c planner-0.14.4/src/pl
+ gtk_widget_set_sensitive (data->option_menu, TRUE);
+
+ cal_dialog_option_menu_set_day (data->option_menu, day);
-
+
+- for (i = 0; i < 5; i++) {
+- gtk_entry_set_text (GTK_ENTRY (data->from_entry[i]), "");
+- gtk_entry_set_text (GTK_ENTRY (data->to_entry[i]), "");
+- }
++ gtk_toggle_button_set_active (
++ GTK_TOGGLE_BUTTON (data->type_radiobutton), TRUE);
++ }
+
- for (l = ivals, i = 0; l && i < 5; l = l->next, i++) {
- MrpInterval *ival;
- mrptime start, end;
- gchar *str;
--
-- ival = l->data;
-+ gtk_toggle_button_set_active (
-+ GTK_TOGGLE_BUTTON (data->type_radiobutton), TRUE);
-+ }
-+
+ calendar = cal_dialog_get_selected_calendar (GTK_TREE_VIEW (data->tree_view));
-+
+
+- ival = l->data;
+ if (day == mrp_day_get_use_base ()) {
+ day = mrp_calendar_get_day (calendar, t, TRUE);
+ }
-
+
- mrp_interval_get_absolute (ival, 0, &start, &end);
+ ivals = mrp_calendar_day_get_intervals (calendar, day, TRUE);
-
+
- str = mrp_time_format ("%H:%M", start);
- gtk_entry_set_text (GTK_ENTRY (data->from_entry[i]), str);
- g_free (str);
@@ -471,7 +464,7 @@ diff -ru planner-0.14.4.orig/src/planner-calendar-dialog.c planner-0.14.4/src/pl
+ gtk_entry_set_text (GTK_ENTRY (data->from_entry[i]), "");
+ gtk_entry_set_text (GTK_ENTRY (data->to_entry[i]), "");
+ }
-
+
- str = mrp_time_format ("%H:%M", end);
- gtk_entry_set_text (GTK_ENTRY (data->to_entry[i]), str);
- g_free (str);
@@ -495,23 +488,23 @@ diff -ru planner-0.14.4.orig/src/planner-calendar-dialog.c planner-0.14.4/src/pl
}
g_signal_handlers_unblock_by_func (data->option_menu,
-diff -ru planner-0.14.4.orig/src/planner-calendar.h planner-0.14.4/src/planner-calendar.h
---- planner-0.14.4.orig/src/planner-calendar.h 2010-03-16 11:18:21.000000000 +0000
-+++ planner-0.14.4/src/planner-calendar.h 2010-04-13 12:53:04.000000000 +0100
+diff -ru planner-0.14.5.orig/src/planner-calendar.h planner-0.14.5/src/planner-calendar.h
+--- planner-0.14.5.orig/src/planner-calendar.h 2010-03-16 11:18:21.000000000 +0000
++++ planner-0.14.5/src/planner-calendar.h 2010-04-13 12:53:04.000000000 +0100
@@ -61,7 +61,7 @@
-
+
gint month;
gint year;
- gint selected_day;
+ GList* selected_days;
-
+
gint day_month[6][7];
gint day[6][7];
@@ -117,10 +117,9 @@
void planner_calendar_display_options (PlannerCalendar *calendar,
PlannerCalendarDisplayOptions flags);
--void planner_calendar_get_date (PlannerCalendar *calendar,
+-void planner_calendar_get_date (PlannerCalendar *calendar,
+GList* planner_calendar_get_dates (PlannerCalendar *calendar,
guint *year,
- guint *month,
@@ -520,9 +513,9 @@ diff -ru planner-0.14.4.orig/src/planner-calendar.h planner-0.14.4/src/planner-c
void planner_calendar_freeze (PlannerCalendar *calendar);
void planner_calendar_thaw (PlannerCalendar *calendar);
-diff -ru planner-0.14.4.orig/src/planner-task-date-widget.c planner-0.14.4/src/planner-task-date-widget.c
---- planner-0.14.4.orig/src/planner-task-date-widget.c 2010-03-16 11:18:21.000000000 +0000
-+++ planner-0.14.4/src/planner-task-date-widget.c 2010-04-13 12:53:04.000000000 +0100
+diff -ru planner-0.14.5.orig/src/planner-task-date-widget.c planner-0.14.5/src/planner-task-date-widget.c
+--- planner-0.14.5.orig/src/planner-task-date-widget.c 2010-03-16 11:18:21.000000000 +0000
++++ planner-0.14.5/src/planner-task-date-widget.c 2010-04-13 12:53:04.000000000 +0100
@@ -293,15 +293,16 @@
planner_task_date_widget_get_date (PlannerTaskDateWidget *widget)
{
@@ -532,12 +525,12 @@ diff -ru planner-0.14.4.orig/src/planner-task-date-widget.c planner-0.14.4/src/p
+ GList *days;
priv = GET_PRIV (widget);
-
-- planner_calendar_get_date (PLANNER_CALENDAR (priv->calendar),
+
+- planner_calendar_get_date (GTK_CALENDAR (priv->calendar),
- &year, &month, &day);
+ days = planner_calendar_get_dates (PLANNER_CALENDAR (priv->calendar),
+ &year, &month);
-
+
month++;
- return mrp_time_compose (year, month, day, 0, 0, 0);
+ return mrp_time_compose (year, month, GPOINTER_TO_INT(days->data), 0, 0, 0);
diff --git a/planner.spec b/planner.spec
index f31d7d3..d9d6e49 100644
--- a/planner.spec
+++ b/planner.spec
@@ -6,8 +6,8 @@
Summary: A graphical project management tool
Name: planner
-Version: 0.14.4
-Release: 34%{?dist}
+Version: 0.14.5
+Release: 1%{?dist}
License: GPLv2+
Group: Applications/Productivity
URL: http://live.gnome.org/Planner
@@ -26,23 +26,18 @@ Requires: shared-mime-info
Requires(post): %{_bindir}/scrollkeeper-update
Requires(postun): %{_bindir}/scrollkeeper-update
-Patch0: planner-gnome349304-recentlyused.patch
Patch1: planner-gnome596173-xdg.patch
Patch2: planner-gnome596966-editoninsert.patch
Patch3: planner-gnome550559-fitzoom.patch
-Patch4: planner-buildfix.patch
-Patch5: planner-gnome603693-planner-calendar-for-edittask.patch
-Patch6: planner-gnome604169-comboboxentry.patch
-Patch7: planner-gnome604355-scrolling.patch
-Patch8: planner-gnome604510.calcolors.patch
-Patch9: planner-gnome604515-usagestatus.patch
-Patch10: planner-gnome604531-tooltips.patch
-Patch11: planner-gnome581282-printpreview.patch
-Patch12: planner-gnome606824-notecolumn.patch
-Patch13: planner-gnome341504-paste.tasks.patch
-Patch14: planner-gnome615641-multiselect.patch
-Patch15: planner-backport-libegg-fixes.patch
-Patch16: planner-0.14.4-edsapi.patch
+Patch4: planner-gnome603693-planner-calendar-for-edittask.patch
+Patch5: planner-gnome604169-comboboxentry.patch
+Patch6: planner-gnome604510.calcolors.patch
+Patch7: planner-gnome604531-tooltips.patch
+Patch8: planner-gnome581282-printpreview.patch
+Patch9: planner-gnome606824-notecolumn.patch
+Patch10: planner-gnome341504-paste.tasks.patch
+Patch11: planner-gnome615641-multiselect.patch
+Patch12: planner-0.14.4-edsapi.patch
%description
Planner is a visual project management application which allows users to
@@ -72,23 +67,18 @@ This package provides a plugin to integration planner and evolution.
%prep
%setup -q
-%patch0 -p1 -b .recentlyused
%patch1 -p1 -b .xdg
%patch2 -p1 -b .editoninsert
%patch3 -p1 -b .fitzoom
-%patch4 -p1 -b .buildfix
-%patch5 -p1 -b .edittask
-%patch6 -p1 -b .combobox
-%patch7 -p1 -b .scrolling
-%patch8 -p1 -b .calcolors
-%patch9 -p1 -b .resourcestatus
-%patch10 -p1 -b .tooltips
-%patch11 -p1 -b .printpreview
-%patch12 -p1 -b .notecolumn
-%patch13 -p1 -b .copypaste
-%patch14 -p1 -b .multiselect
-%patch15 -p1 -b .libeggfixes
-%patch16 -p1 -b .edsapi.patch
+%patch4 -p1 -b .edittask
+%patch5 -p1 -b .combobox
+%patch6 -p1 -b .calcolors
+%patch7 -p1 -b .tooltips
+%patch8 -p1 -b .printpreview
+%patch9 -p1 -b .notecolumn
+%patch10 -p1 -b .copypaste
+%patch11 -p1 -b .multiselect
+%patch12 -p1 -b .edsapi.patch
%build
rm -rf libegg
@@ -193,6 +183,14 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pkgconfig/*
%changelog
+* Thu Jul 07 2011 Caolán McNamara <caolanm at redhat.com> - 0.14.5-1
+- Resolves: rhbz#719488 latest version
+- drop integrated planner-gnome349304-recentlyused.patch
+- drop integrated planner-buildfix.patch
+- drop integrated planner-gnome604355-scrolling.patch
+- drop integrated planner-gnome604515-usagestatus.patch
+- drop integrated planner-backport-libegg-fixes.patch
+
* Wed Feb 16 2011 Caolán McNamara <caolanm at redhat.com> - 0.14.4-34
- Resolves: rhbz#675629 crash, possibly from wrong float/int type
diff --git a/sources b/sources
index b74e1fe..48a6358 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8fcbd1b55dd037662f7710a28a96bb92 planner-0.14.4.tar.bz2
+611220d902eb93c74fc237cf02301e71 planner-0.14.5.tar.bz2
More information about the scm-commits
mailing list