[Xfce4-commits] [apps/orage] 01/01: 4.11.2.0 Possible to set delayed file close time
noreply at xfce.org
noreply at xfce.org
Wed Oct 1 16:53:43 CEST 2014
This is an automated email from the git hooks/post-receive script.
juha pushed a commit to branch master
in repository apps/orage.
commit 540e632b589728f7942b85031e471087b4e04a4d
Author: Juha Kautto <juha at xfce.org>
Date: Wed Oct 1 17:51:18 2014 +0300
4.11.2.0 Possible to set delayed file close time
Added parameter to control delayed file close timing: File close delay.
Default is 10 minutes like before, but it can now be tuned. It does not exist
in parameter screen so needs to be done manually.
Also fixed month screen scroll timer handling.
---
configure.in.in | 2 +-
src/ical-code.c | 9 +++++----
src/main.c | 2 +-
src/mainbox.c | 10 ++++++----
src/parameters.c | 2 ++
src/parameters.h | 3 +++
6 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/configure.in.in b/configure.in.in
index fd09259..f39b5a4 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -9,7 +9,7 @@ dnl Written for Xfce by Juha Kautto <juha at xfce.org>
dnl
dnl Version information
-m4_define([orage_version], [4.11.1.2-git])
+m4_define([orage_version], [4.11.2.0-git])
m4_define([gtk_minimum_version], [2.14.0])
m4_define([xfce_minimum_version], [4.8.0])
diff --git a/src/ical-code.c b/src/ical-code.c
index b52c466..da60441 100644
--- a/src/ical-code.c
+++ b/src/ical-code.c
@@ -473,7 +473,7 @@ void xfical_file_close(gboolean foreign)
orage_message(-10, P_N "canceling delayed close");
#endif
}
- if (ic_file_modified) { /* close it now */
+ if (ic_file_modified || g_par.file_close_delay == 0) { /* close it now */
#ifdef ORAGE_DEBUG
orage_message(-10, P_N "closing file now");
#endif
@@ -488,11 +488,12 @@ void xfical_file_close(gboolean foreign)
g_par.latest_file_change = s.st_mtime;
}
}
- else { /* close it later = after 10 minutes (to save time) */
+ else { /* close it later (to save time) */
#ifdef ORAGE_DEBUG
- orage_message(-10, P_N "closing file after 10 minutes");
+ orage_message(-10, P_N "closing file after %d seconds",
+ g_par.file_close_delay);
#endif
- file_close_timer = g_timeout_add_seconds(10*60
+ file_close_timer = g_timeout_add_seconds(g_par.file_close_delay
, (GtkFunction)delayed_file_close, NULL);
}
}
diff --git a/src/main.c b/src/main.c
index f704e68..ed34820 100644
--- a/src/main.c
+++ b/src/main.c
@@ -88,7 +88,7 @@ static void handle_resuming(void)
GError *error = NULL;
DBusGProxy *proxy;
- g_type_init();
+ g_type_init(); /* deprecated in GLib 2.36 and happens now automatically */
connection = dbus_g_bus_get(DBUS_BUS_SYSTEM, &error);
if (connection) {
proxy = dbus_g_proxy_new_for_name(connection, "org.freedesktop.UPower"
diff --git a/src/mainbox.c b/src/mainbox.c
index 8d7b8af..6fbecd3 100644
--- a/src/mainbox.c
+++ b/src/mainbox.c
@@ -55,6 +55,7 @@
#define ORAGE_DEBUG 1
*/
+static guint month_change_timer=0;
gboolean orage_mark_appointments(void)
{
@@ -255,6 +256,7 @@ static gboolean upd_calendar(GtkCalendar *calendar)
orage_message(-100, P_N);
#endif
orage_mark_appointments();
+ month_change_timer = 0;
return(FALSE); /* we do this only once */
}
@@ -262,7 +264,6 @@ void mCalendar_month_changed_cb(GtkCalendar *calendar, gpointer user_data)
{
#undef P_N
#define P_N "mCalendar_month_changed_cb: "
- static guint timer=0;
#ifdef ORAGE_DEBUG
orage_message(-100, P_N);
#endif
@@ -273,11 +274,12 @@ void mCalendar_month_changed_cb(GtkCalendar *calendar, gpointer user_data)
* running updates since this new one will overwrite them anyway.
* Let's clear still the view to fix bug 3913 (only needed
* if there are changes in the calendar) */
- if (timer)
- g_source_remove(timer);
+ if (month_change_timer) {
+ g_source_remove(month_change_timer);
+ }
if (calendar->num_marked_dates) /* undocumented, internal field; ugly */
gtk_calendar_clear_marks(calendar);
- timer = g_timeout_add(400, (GtkFunction)upd_calendar, calendar);
+ month_change_timer = g_timeout_add(400, (GtkFunction)upd_calendar, calendar);
}
static void build_menu(void)
diff --git a/src/parameters.c b/src/parameters.c
index 1f5cb56..a4bb038 100644
--- a/src/parameters.c
+++ b/src/parameters.c
@@ -1283,6 +1283,7 @@ void read_parameters(void)
g_par.priority_list_limit = orage_rc_get_int(orc, "Priority list limit", 8);
g_par.use_wakeup_timer = orage_rc_get_bool(orc, "Use wakeup timer", TRUE);
g_par.close_means_quit = orage_rc_get_bool(orc, "Always quit", FALSE);
+ g_par.file_close_delay = orage_rc_get_int(orc, "File close delay", 600);
orage_rc_file_close(orc);
}
@@ -1385,6 +1386,7 @@ void write_parameters(void)
orage_rc_put_int(orc, "Priority list limit", g_par.priority_list_limit);
orage_rc_put_bool(orc, "Use wakeup timer", g_par.use_wakeup_timer);
orage_rc_put_bool(orc, "Always quit", g_par.close_means_quit);
+ orage_rc_put_int(orc, "File close delay", g_par.file_close_delay);
orage_rc_file_close(orc);
}
diff --git a/src/parameters.h b/src/parameters.h
index 7156817..7e999ee 100644
--- a/src/parameters.h
+++ b/src/parameters.h
@@ -133,6 +133,9 @@ typedef struct _parameters
/* always quit instead of going to background when asked to close */
gboolean close_means_quit;
+
+ /* delayed close length in seconds. 0 = close immediately */
+ gint file_close_delay;
} global_parameters; /* global parameters */
#ifdef ORAGE_MAIN
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list