[Xfce4-commits] <orage:master> 4.7.5.10: Removed delay in tray icon tooltip after updating appointment

[Juha Kautto]

Updating branch refs/heads/master
         to 7a12b0ec459f65f172ac5851c128c51459d20782 (commit)
       from f7827de1021cde7d8d1f949e5f9a95a634146539 (commit)

commit 7a12b0ec459f65f172ac5851c128c51459d20782
Author: Juha Kautto <juha at xfce.org>
Date:   Mon Jan 4 15:12:49 2010 +0200

    4.7.5.10: Removed delay in tray icon tooltip after updating appointment
    
    There was sometimes upto 11 seconds delay after updating appointment before
    the new data was seen in tray icon tooltip. Now the maximum delay is about
    3 seconds.
    
    Changing now the icon on parameter window when icon type is changed
    from dynamic to static or vice verca.
    
    Minor string change also in the icon type tooltip since dynamic icon is now
    used everwhere.

 configure.in.in  |    2 +-
 src/parameters.c |    6 +++++-
 src/reminder.c   |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/configure.in.in b/configure.in.in
index 5fc03b4..52ebcd1 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.7.5.9-git])
+m4_define([orage_version], [4.7.5.10-git])
 
 m4_define([gtk_minimum_version], [2.10.0])
 m4_define([xfce_minimum_version], [4.6.0])
diff --git a/src/parameters.c b/src/parameters.c
index ebf9951..c6f9308 100644
--- a/src/parameters.c
+++ b/src/parameters.c
@@ -460,10 +460,14 @@ static void always_today_changed(GtkWidget *dialog, gpointer user_data)
 static void use_dynamic_icon_changed(GtkWidget *dialog, gpointer user_data)
 {
     Itf *itf = (Itf *)user_data;
+    GdkPixbuf *orage_logo;
 
     g_par.use_dynamic_icon = gtk_toggle_button_get_active(
             GTK_TOGGLE_BUTTON(itf->use_dynamic_icon_checkbutton));
     refresh_TrayIcon();
+    orage_logo = orage_create_icon(FALSE, 48);
+    gtk_window_set_icon(GTK_WINDOW(itf->orage_dialog), orage_logo);
+    g_object_unref(orage_logo);
 }
 
 static void el_extra_days_spin_changed(GtkSpinButton *sb, gpointer user_data)
@@ -788,7 +792,7 @@ static void create_parameter_dialog_extra_setup_tab(Itf *dialog)
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(
             dialog->use_dynamic_icon_checkbutton), g_par.use_dynamic_icon);
     gtk_tooltips_set_tip(dialog->Tooltips, dialog->use_dynamic_icon_checkbutton
-            , _("Dynamic icon shows current month and day of the month. It is visible only in system tray.")
+            , _("Dynamic icon shows current month and day of the month.")
             , NULL);
     g_signal_connect(G_OBJECT(dialog->use_dynamic_icon_checkbutton), "toggled"
             , G_CALLBACK(use_dynamic_icon_changed), dialog);
diff --git a/src/reminder.c b/src/reminder.c
index 1a65f0a..a3109a2 100644
--- a/src/reminder.c
+++ b/src/reminder.c
@@ -1112,7 +1112,7 @@ static gboolean reset_orage_tooltip_update()
 #endif
     t = orage_localtime();
     secs_left = 60 - t->tm_sec;
-    if (secs_left > 10) 
+    if (secs_left > 2) 
         orage_tooltip_update(NULL);
     /* FIXME: do not start this, if it is already in progress.
      * Minor thing and does not cause any real trouble and happens