Author: juha
Date: 2008-01-01 22:45:58 +0000 (Tue, 01 Jan 2008)
New Revision: 26522

Modified:
   xfcalendar/trunk/configure.in.in
   xfcalendar/trunk/src/about-xfcalendar.c
   xfcalendar/trunk/src/about-xfcalendar.h
   xfcalendar/trunk/src/appointment.c
   xfcalendar/trunk/src/appointment.h
   xfcalendar/trunk/src/day-view.c
   xfcalendar/trunk/src/day-view.h
   xfcalendar/trunk/src/event-list.c
   xfcalendar/trunk/src/event-list.h
   xfcalendar/trunk/src/functions.c
   xfcalendar/trunk/src/functions.h
   xfcalendar/trunk/src/ical-code.c
   xfcalendar/trunk/src/ical-code.h
   xfcalendar/trunk/src/interface.c
   xfcalendar/trunk/src/interface.h
   xfcalendar/trunk/src/main.c
   xfcalendar/trunk/src/mainbox.c
   xfcalendar/trunk/src/mainbox.h
   xfcalendar/trunk/src/orage-dbus-client.c
   xfcalendar/trunk/src/orage-dbus-object.c
   xfcalendar/trunk/src/orage-dbus-object.h
   xfcalendar/trunk/src/orage-dbus.h
   xfcalendar/trunk/src/orage-i18n.h
   xfcalendar/trunk/src/parameters.c
   xfcalendar/trunk/src/parameters.h
   xfcalendar/trunk/src/reminder.c
   xfcalendar/trunk/src/reminder.h
   xfcalendar/trunk/src/tray_icon.c
   xfcalendar/trunk/src/tray_icon.h
Log:
1) fixed few memory leaks
2) finalized texts
3) update copyright to include new year 2008


Modified: xfcalendar/trunk/configure.in.in
===================================================================
--- xfcalendar/trunk/configure.in.in    2008-01-01 22:29:56 UTC (rev 26521)
+++ xfcalendar/trunk/configure.in.in    2008-01-01 22:45:58 UTC (rev 26522)
@@ -9,7 +9,7 @@
 dnl
 
 dnl Version information
-m4_define([orage_version], [4.5.11.3-svn])
+m4_define([orage_version], [4.5.12.0-svn])
 
 m4_define([gtk_minimum_version], [2.6.0])
 m4_define([xfce_minimum_version], [4.4.0])

Modified: xfcalendar/trunk/src/about-xfcalendar.c
===================================================================
--- xfcalendar/trunk/src/about-xfcalendar.c     2008-01-01 22:29:56 UTC (rev 
26521)
+++ xfcalendar/trunk/src/about-xfcalendar.c     2008-01-01 22:45:58 UTC (rev 
26522)
@@ -1,6 +1,6 @@
 /*      Orage - Calendar and alarm handler
  *
- * Copyright (c) 2005-2007 Juha Kautto  (juha at xfce.org)
+ * Copyright (c) 2005-2008 Juha Kautto  (juha at xfce.org)
  * Copyright (c) 2004-2006 Mickael Graf (korbinus at xfce.org)
  *
  * This program is free software; you can redistribute it and/or modify
@@ -40,7 +40,7 @@
 
   about = xfce_about_info_new("Orage", VERSION
           , _("Manage your time with Xfce4")
-          , XFCE_COPYRIGHT_TEXT("2003-2007", " Juha Kautto")
+          , XFCE_COPYRIGHT_TEXT("2003-2008", " Juha Kautto")
           , XFCE_LICENSE_GPL);
   orage_logo = orage_create_icon(xfcal, FALSE, 48, 48);
   xfce_about_info_set_homepage(about, "http://www.xfce.org";);

Modified: xfcalendar/trunk/src/about-xfcalendar.h
===================================================================
--- xfcalendar/trunk/src/about-xfcalendar.h     2008-01-01 22:29:56 UTC (rev 
26521)
+++ xfcalendar/trunk/src/about-xfcalendar.h     2008-01-01 22:45:58 UTC (rev 
26522)
@@ -1,6 +1,6 @@
 /*      Orage - Calendar and alarm handler
  *
- * Copyright (c) 2006-2007 Juha Kautto  (juha at xfce.org)
+ * Copyright (c) 2006-2008 Juha Kautto  (juha at xfce.org)
  * Copyright (c) 2004-2006 Mickael Graf (korbinus at xfce.org)
  *
  * This program is free software; you can redistribute it and/or modify

Modified: xfcalendar/trunk/src/appointment.c
===================================================================
--- xfcalendar/trunk/src/appointment.c  2008-01-01 22:29:56 UTC (rev 26521)
+++ xfcalendar/trunk/src/appointment.c  2008-01-01 22:45:58 UTC (rev 26522)
@@ -1,6 +1,6 @@
 /*      Orage - Calendar and alarm handler
  *
- * Copyright (c) 2005-2007 Juha Kautto  (juha at xfce.org)
+ * Copyright (c) 2005-2008 Juha Kautto  (juha at xfce.org)
  * Copyright (c) 2004-2005 Mickael Graf (korbinus at xfce.org)
  *
  * This program is free software; you can redistribute it and/or modify

Modified: xfcalendar/trunk/src/appointment.h
===================================================================
--- xfcalendar/trunk/src/appointment.h  2008-01-01 22:29:56 UTC (rev 26521)
+++ xfcalendar/trunk/src/appointment.h  2008-01-01 22:45:58 UTC (rev 26522)
@@ -1,6 +1,6 @@
 /*      Orage - Calendar and alarm handler
  *
- * Copyright (c) 2005-2007 Juha Kautto  (juha at xfce.org)
+ * Copyright (c) 2005-2008 Juha Kautto  (juha at xfce.org)
  * Copyright (c) 2004-2006 Mickael Graf (korbinus at xfce.org)
  *
  * This program is free software; you can redistribute it and/or modify

Modified: xfcalendar/trunk/src/day-view.c
===================================================================
--- xfcalendar/trunk/src/day-view.c     2008-01-01 22:29:56 UTC (rev 26521)
+++ xfcalendar/trunk/src/day-view.c     2008-01-01 22:45:58 UTC (rev 26522)
@@ -1,6 +1,6 @@
 /*      Orage - Calendar and alarm handler
  *
- * Copyright (c) 2007      Juha Kautto  (juha at xfce.org)
+ * Copyright (c) 2007-2008      Juha Kautto  (juha at xfce.org)
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

Modified: xfcalendar/trunk/src/day-view.h
===================================================================
--- xfcalendar/trunk/src/day-view.h     2008-01-01 22:29:56 UTC (rev 26521)
+++ xfcalendar/trunk/src/day-view.h     2008-01-01 22:45:58 UTC (rev 26522)
@@ -1,6 +1,6 @@
 /*      Orage - Calendar and alarm handler
  *
- * Copyright (c) 2005-2007 Juha Kautto  (juha at xfce.org)
+ * Copyright (c) 2005-2008 Juha Kautto  (juha at xfce.org)
  * Copyright (c) 2004-2006 Mickael Graf (korbinus at xfce.org)
  *
  * This program is free software; you can redistribute it and/or modify

Modified: xfcalendar/trunk/src/event-list.c
===================================================================
--- xfcalendar/trunk/src/event-list.c   2008-01-01 22:29:56 UTC (rev 26521)
+++ xfcalendar/trunk/src/event-list.c   2008-01-01 22:45:58 UTC (rev 26522)
@@ -1,6 +1,6 @@
 /*      Orage - Calendar and alarm handler
  *
- * Copyright (c) 2005-2007 Juha Kautto  (juha at xfce.org)
+ * Copyright (c) 2005-2008 Juha Kautto  (juha at xfce.org)
  * Copyright (c) 2004-2005 Mickael Graf (korbinus at xfce.org)
  *
  * This program is free software; you can redistribute it and/or modify

Modified: xfcalendar/trunk/src/event-list.h
===================================================================
--- xfcalendar/trunk/src/event-list.h   2008-01-01 22:29:56 UTC (rev 26521)
+++ xfcalendar/trunk/src/event-list.h   2008-01-01 22:45:58 UTC (rev 26522)
@@ -1,6 +1,6 @@
 /*      Orage - Calendar and alarm handler
  *
- * Copyright (c) 2005-2007 Juha Kautto  (juha at xfce.org)
+ * Copyright (c) 2005-2008 Juha Kautto  (juha at xfce.org)
  * Copyright (c) 2004-2005 Mickael Graf (korbinus at xfce.org)
  *
  * This program is free software; you can redistribute it and/or modify

Modified: xfcalendar/trunk/src/functions.c
===================================================================
--- xfcalendar/trunk/src/functions.c    2008-01-01 22:29:56 UTC (rev 26521)
+++ xfcalendar/trunk/src/functions.c    2008-01-01 22:45:58 UTC (rev 26522)
@@ -1,6 +1,6 @@
 /*      Orage - Calendar and alarm handler
  *
- * Copyright (c) 2005-2007 Juha Kautto  (juha at xfce.org)
+ * Copyright (c) 2005-2008 Juha Kautto  (juha at xfce.org)
  * Copyright (c) 2003-2005 Mickael Graf (korbinus at xfce.org)
  *
  * This program is free software; you can redistribute it and/or modify

Modified: xfcalendar/trunk/src/functions.h
===================================================================
--- xfcalendar/trunk/src/functions.h    2008-01-01 22:29:56 UTC (rev 26521)
+++ xfcalendar/trunk/src/functions.h    2008-01-01 22:45:58 UTC (rev 26522)
@@ -1,6 +1,6 @@
 /*      Orage - Calendar and alarm handler
  *
- * Copyright (c) 2006-2007 Juha Kautto  (juha at xfce.org)
+ * Copyright (c) 2006-2008 Juha Kautto  (juha at xfce.org)
  * Copyright (c) 2005-2006 Mickael Graf (korbinus at xfce.org)
  *
  * This program is free software; you can redistribute it and/or modify

Modified: xfcalendar/trunk/src/ical-code.c
===================================================================
--- xfcalendar/trunk/src/ical-code.c    2008-01-01 22:29:56 UTC (rev 26521)
+++ xfcalendar/trunk/src/ical-code.c    2008-01-01 22:45:58 UTC (rev 26522)
@@ -1,6 +1,6 @@
 /*      Orage - Calendar and alarm handler
  *
- * Copyright (c) 2005-2007 Juha Kautto  (juha at xfce.org)
+ * Copyright (c) 2005-2008 Juha Kautto  (juha at xfce.org)
  * Copyright (c) 2003-2005 Mickael Graf (korbinus at xfce.org)
  *
  * This program is free software; you can redistribute it and/or modify

Modified: xfcalendar/trunk/src/ical-code.h
===================================================================
--- xfcalendar/trunk/src/ical-code.h    2008-01-01 22:29:56 UTC (rev 26521)
+++ xfcalendar/trunk/src/ical-code.h    2008-01-01 22:45:58 UTC (rev 26522)
@@ -1,6 +1,6 @@
 /*      Orage - Calendar and alarm handler
  *
- * Copyright (c) 2005-2007 Juha Kautto  (juha at xfce.org)
+ * Copyright (c) 2005-2008 Juha Kautto  (juha at xfce.org)
  * Copyright (c) 2004-2005 Mickael Graf (korbinus at xfce.org)
  *
  * This program is free software; you can redistribute it and/or modify

Modified: xfcalendar/trunk/src/interface.c
===================================================================
--- xfcalendar/trunk/src/interface.c    2008-01-01 22:29:56 UTC (rev 26521)
+++ xfcalendar/trunk/src/interface.c    2008-01-01 22:45:58 UTC (rev 26522)
@@ -1,6 +1,6 @@
 /*      Orage - Calendar and alarm handler
  *
- * Copyright (c) 2005-2007 Juha Kautto  (juha at xfce.org)
+ * Copyright (c) 2005-2008 Juha Kautto  (juha at xfce.org)
  * Copyright (c) 2003-2005 Mickael Graf (korbinus at xfce.org)
  *
  * This program is free software; you can redistribute it and/or modify

Modified: xfcalendar/trunk/src/interface.h
===================================================================
--- xfcalendar/trunk/src/interface.h    2008-01-01 22:29:56 UTC (rev 26521)
+++ xfcalendar/trunk/src/interface.h    2008-01-01 22:45:58 UTC (rev 26522)
@@ -1,6 +1,6 @@
 /*      Orage - Calendar and alarm handler
  *
- * Copyright (c) 2006-2007 Juha Kautto  (juha at xfce.org)
+ * Copyright (c) 2006-2008 Juha Kautto  (juha at xfce.org)
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

Modified: xfcalendar/trunk/src/main.c
===================================================================
--- xfcalendar/trunk/src/main.c 2008-01-01 22:29:56 UTC (rev 26521)
+++ xfcalendar/trunk/src/main.c 2008-01-01 22:45:58 UTC (rev 26522)
@@ -1,6 +1,6 @@
 /*      Orage - Calendar and alarm handler
  *
- * Copyright (c) 2005-2007 Juha Kautto  (juha at xfce.org)
+ * Copyright (c) 2005-2008 Juha Kautto  (juha at xfce.org)
  * Copyright (c) 2003-2006 Mickael Graf (korbinus at xfce.org)
  *
  * This program is free software; you can redistribute it and/or modify

Modified: xfcalendar/trunk/src/mainbox.c
===================================================================
--- xfcalendar/trunk/src/mainbox.c      2008-01-01 22:29:56 UTC (rev 26521)
+++ xfcalendar/trunk/src/mainbox.c      2008-01-01 22:45:58 UTC (rev 26522)
@@ -1,6 +1,6 @@
 /*      Orage - Calendar and alarm handler
  *
- * Copyright (c) 2005-2007 Juha Kautto  (juha at xfce.org)
+ * Copyright (c) 2005-2008 Juha Kautto  (juha at xfce.org)
  * Copyright (c) 2004-2005 Mickael Graf (korbinus at xfce.org)
  *
  * This program is free software; you can redistribute it and/or modify

Modified: xfcalendar/trunk/src/mainbox.h
===================================================================
--- xfcalendar/trunk/src/mainbox.h      2008-01-01 22:29:56 UTC (rev 26521)
+++ xfcalendar/trunk/src/mainbox.h      2008-01-01 22:45:58 UTC (rev 26522)
@@ -1,6 +1,6 @@
 /*      Orage - Calendar and alarm handler
  *
- * Copyright (c) 2005-2007 Juha Kautto  (juha at xfce.org)
+ * Copyright (c) 2005-2008 Juha Kautto  (juha at xfce.org)
  * Copyright (c) 2004-2006 Mickael Graf (korbinus at xfce.org)
  *
  * This program is free software; you can redistribute it and/or modify

Modified: xfcalendar/trunk/src/orage-dbus-client.c
===================================================================
--- xfcalendar/trunk/src/orage-dbus-client.c    2008-01-01 22:29:56 UTC (rev 
26521)
+++ xfcalendar/trunk/src/orage-dbus-client.c    2008-01-01 22:45:58 UTC (rev 
26522)
@@ -1,6 +1,6 @@
 /*      Orage - Calendar and alarm handler
  *
- * Copyright (c) 2006-2007 Juha Kautto  (juha at xfce.org)
+ * Copyright (c) 2006-2008 Juha Kautto  (juha at xfce.org)
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

Modified: xfcalendar/trunk/src/orage-dbus-object.c
===================================================================
--- xfcalendar/trunk/src/orage-dbus-object.c    2008-01-01 22:29:56 UTC (rev 
26521)
+++ xfcalendar/trunk/src/orage-dbus-object.c    2008-01-01 22:45:58 UTC (rev 
26522)
@@ -1,6 +1,6 @@
 /*      Orage - Calendar and alarm handler
  *
- * Copyright (c) 2006-2007 Juha Kautto  (juha at xfce.org)
+ * Copyright (c) 2006-2008 Juha Kautto  (juha at xfce.org)
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

Modified: xfcalendar/trunk/src/orage-dbus-object.h
===================================================================
--- xfcalendar/trunk/src/orage-dbus-object.h    2008-01-01 22:29:56 UTC (rev 
26521)
+++ xfcalendar/trunk/src/orage-dbus-object.h    2008-01-01 22:45:58 UTC (rev 
26522)
@@ -1,6 +1,6 @@
 /*      Orage - Calendar and alarm handler
  *
- * Copyright (c) 2006-2007 Juha Kautto  (juha at xfce.org)
+ * Copyright (c) 2006-2008 Juha Kautto  (juha at xfce.org)
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

Modified: xfcalendar/trunk/src/orage-dbus.h
===================================================================
--- xfcalendar/trunk/src/orage-dbus.h   2008-01-01 22:29:56 UTC (rev 26521)
+++ xfcalendar/trunk/src/orage-dbus.h   2008-01-01 22:45:58 UTC (rev 26522)
@@ -1,6 +1,6 @@
 /*      Orage - Calendar and alarm handler
  *
- * Copyright (c) 2006-2007 Juha Kautto  (juha at xfce.org)
+ * Copyright (c) 2006-2008 Juha Kautto  (juha at xfce.org)
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

Modified: xfcalendar/trunk/src/orage-i18n.h
===================================================================
--- xfcalendar/trunk/src/orage-i18n.h   2008-01-01 22:29:56 UTC (rev 26521)
+++ xfcalendar/trunk/src/orage-i18n.h   2008-01-01 22:45:58 UTC (rev 26522)
@@ -1,6 +1,6 @@
 /*      Orage - Calendar and alarm handler
  *
- * Copyright (c) 2007      Juha Kautto  (juha at xfce.org)
+ * Copyright (c) 2007-2008 Juha Kautto  (juha at xfce.org)
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

Modified: xfcalendar/trunk/src/parameters.c
===================================================================
--- xfcalendar/trunk/src/parameters.c   2008-01-01 22:29:56 UTC (rev 26521)
+++ xfcalendar/trunk/src/parameters.c   2008-01-01 22:45:58 UTC (rev 26522)
@@ -1,6 +1,6 @@
 /*      Orage - Calendar and alarm handler
  *
- * Copyright (c) 2006-2007 Juha Kautto  (juha at xfce.org)
+ * Copyright (c) 2006-2008 Juha Kautto  (juha at xfce.org)
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -46,6 +46,8 @@
 
 typedef struct _Itf
 {
+    GtkTooltips *Tooltips;
+
     GtkWidget *orage_dialog;
     GtkWidget *dialog_vbox1;
     GtkWidget *notebook;
@@ -122,8 +124,10 @@
     return(file_name);
 }
 
-static void dialog_response(GtkWidget *dialog, gint response_id)
+static void dialog_response(GtkWidget *dialog, gint response_id
+        , gpointer user_data)
 {
+    Itf *itf = (Itf *)user_data;
     gchar *helpdoc;
 
     if (response_id == GTK_RESPONSE_HELP) {
@@ -136,10 +140,12 @@
                 , NULL);
         orage_exec(helpdoc, NULL, NULL);
     }
-    else {
+    else { /* delete signal or close response */
         write_parameters();
         is_running = FALSE;
         gtk_widget_destroy(dialog);
+        gtk_object_destroy(GTK_OBJECT(itf->Tooltips));
+        g_free(itf);
     }
 }
 
@@ -411,6 +417,9 @@
     }
     gtk_box_pack_start(GTK_BOX(vbox)
             , dialog->timezone_button, FALSE, FALSE, 5);
+    gtk_tooltips_set_tip(dialog->Tooltips, dialog->timezone_button
+            , _("You should always define your local timezone.")
+            , NULL);
     g_signal_connect(G_OBJECT(dialog->timezone_button), "clicked"
             , G_CALLBACK(timezone_button_clicked), dialog);
 
@@ -430,6 +439,9 @@
             , dialog->archive_threshold_spin, FALSE, FALSE, 5);
     label = gtk_label_new(_("(0 = no archiving)"));
     gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
+    gtk_tooltips_set_tip(dialog->Tooltips, dialog->archive_threshold_spin
+            , _("Archiving is used to save time and space when handling 
events.")
+            , NULL);
     g_signal_connect(G_OBJECT(dialog->archive_threshold_spin), "value-changed"
             , G_CALLBACK(archive_threshold_spin_changed), dialog);
 #endif
@@ -451,6 +463,9 @@
     gtk_box_pack_start(GTK_BOX(hbox)
             , dialog->sound_application_open_button, FALSE, FALSE, 5);
 
+    gtk_tooltips_set_tip(dialog->Tooltips, dialog->sound_application_entry
+            , _("This command is given to shell to make sound in alarms.")
+            , NULL);
     g_signal_connect(G_OBJECT(dialog->sound_application_open_button), "clicked"
             , G_CALLBACK(sound_application_open_button_clicked), dialog);
     g_signal_connect(G_OBJECT(dialog->sound_application_entry), "changed"
@@ -593,7 +608,7 @@
 
 static void create_parameter_dialog_extra_setup_tab(Itf *dialog)
 {
-    GtkWidget *hbox, *vbox, *label;
+    GtkWidget *hbox, *vbox, *label, *event;
     gchar *weekday_array[7] = {
             _("Monday"), _("Tuesday"), _("Wednesday"), _("Thursday")
           , _("Friday"), _("Saturday"), _("Sunday")};
@@ -618,6 +633,9 @@
             , dialog->always_today_checkbutton, FALSE, FALSE, 5);
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(
             dialog->always_today_checkbutton), g_par.select_always_today);
+    gtk_tooltips_set_tip(dialog->Tooltips, dialog->always_today_checkbutton
+            , _("When showing main calendar, set pointer to either previously 
selected day or always to current day.")
+            , NULL);
     g_signal_connect(G_OBJECT(dialog->always_today_checkbutton), "toggled"
             , G_CALLBACK(always_today_changed), dialog);
 
@@ -630,10 +648,15 @@
 
     dialog->ical_weekstartday_combobox = orage_create_combo_box_with_content(
             weekday_array, 7);
+    event =  gtk_event_box_new(); /* only needed for tooltips */
+    gtk_container_add(GTK_CONTAINER(event), 
dialog->ical_weekstartday_combobox);
     gtk_box_pack_start(GTK_BOX(hbox)
-            , dialog->ical_weekstartday_combobox, FALSE, FALSE, 5);
+            , event, FALSE, FALSE, 5);
     gtk_combo_box_set_active(GTK_COMBO_BOX(dialog->ical_weekstartday_combobox)
             , g_par.ical_weekstartday);
+    gtk_tooltips_set_tip(dialog->Tooltips, event
+            , _("This is used in some weekly repeating appointment rules. Just 
set it to the start day of the week for your country and forget it.")
+            , NULL);
     g_signal_connect(G_OBJECT(dialog->ical_weekstartday_combobox), "changed"
             , G_CALLBACK(ical_weekstartday_changed), dialog);
 
@@ -655,6 +678,9 @@
             , g_par.icon_size_x);
     label = gtk_label_new(_("(0 = use static icon)"));
     gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
+    gtk_tooltips_set_tip(dialog->Tooltips, dialog->icon_size_x_spin
+            , _("Dynamic icon shows current day and month. It is visible only 
in tray. If tray is too small for dynamic icon size, Orage switches 
automatically back to status icon.")
+            , NULL);
     g_signal_connect(G_OBJECT(dialog->icon_size_x_spin), "value-changed"
             , G_CALLBACK(icon_size_x_spin_changed), dialog);
 
@@ -713,6 +739,7 @@
     Itf *dialog;
 
     dialog = g_new(Itf, 1);
+    dialog->Tooltips = gtk_tooltips_new();
 
     dialog->orage_dialog = xfce_titled_dialog_new();
     gtk_window_set_default_size(GTK_WINDOW(dialog->orage_dialog), 300, 350);
@@ -745,8 +772,8 @@
             , dialog->close_button, GTK_RESPONSE_CLOSE);
     GTK_WIDGET_SET_FLAGS(dialog->close_button, GTK_CAN_DEFAULT);
 
-    g_signal_connect(G_OBJECT (dialog->orage_dialog), "response"
-            , G_CALLBACK(dialog_response), NULL);
+    g_signal_connect(G_OBJECT(dialog->orage_dialog), "response"
+            , G_CALLBACK(dialog_response), dialog);
 
     gtk_widget_show_all(dialog->orage_dialog);
     /*
@@ -892,12 +919,13 @@
 {
     static Itf *dialog = NULL;
 
-    if (is_running && dialog && dialog->orage_dialog) {
+    if (is_running) {
         gtk_window_present(GTK_WINDOW(dialog->orage_dialog));
-        return;
     }
-    is_running = TRUE;
-    dialog = create_parameter_dialog();
+    else {
+        is_running = TRUE;
+        dialog = create_parameter_dialog();
+    }
 }
 
 void set_parameters()

Modified: xfcalendar/trunk/src/parameters.h
===================================================================
--- xfcalendar/trunk/src/parameters.h   2008-01-01 22:29:56 UTC (rev 26521)
+++ xfcalendar/trunk/src/parameters.h   2008-01-01 22:45:58 UTC (rev 26522)
@@ -1,6 +1,6 @@
 /*      Orage - Calendar and alarm handler
  *
- * Copyright (c) 2006-2007 Juha Kautto  (juha at xfce.org)
+ * Copyright (c) 2006-2008 Juha Kautto  (juha at xfce.org)
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

Modified: xfcalendar/trunk/src/reminder.c
===================================================================
--- xfcalendar/trunk/src/reminder.c     2008-01-01 22:29:56 UTC (rev 26521)
+++ xfcalendar/trunk/src/reminder.c     2008-01-01 22:45:58 UTC (rev 26522)
@@ -1,6 +1,6 @@
 /*      Orage - Calendar and alarm handler
  *
- * Copyright (c) 2005-2007 Juha Kautto  (juha at xfce.org)
+ * Copyright (c) 2005-2008 Juha Kautto  (juha at xfce.org)
  * Copyright (c) 2003-2006 Mickael Graf (korbinus at xfce.org)
  *
  * This program is free software; you can redistribute it and/or modify

Modified: xfcalendar/trunk/src/reminder.h
===================================================================
--- xfcalendar/trunk/src/reminder.h     2008-01-01 22:29:56 UTC (rev 26521)
+++ xfcalendar/trunk/src/reminder.h     2008-01-01 22:45:58 UTC (rev 26522)
@@ -1,6 +1,6 @@
 /*      Orage - Calendar and alarm handler
  *
- * Copyright (c) 2005-2007 Juha Kautto  (juha at xfce.org)
+ * Copyright (c) 2005-2008 Juha Kautto  (juha at xfce.org)
  * Copyright (c) 2004-2006 Mickael Graf (korbinus at xfce.org)
  *
  * This program is free software; you can redistribute it and/or modify

Modified: xfcalendar/trunk/src/tray_icon.c
===================================================================
--- xfcalendar/trunk/src/tray_icon.c    2008-01-01 22:29:56 UTC (rev 26521)
+++ xfcalendar/trunk/src/tray_icon.c    2008-01-01 22:45:58 UTC (rev 26522)
@@ -1,6 +1,6 @@
 /*      Orage - Calendar and alarm handler
  *
- * Copyright (c) 2006-2007 Juha Kautto  (juha at xfce.org)
+ * Copyright (c) 2006-2008 Juha Kautto  (juha at xfce.org)
  * Copyright (c) 2004-2006 Mickael Graf (korbinus at xfce.org)
  *
  * This program is free software; you can redistribute it and/or modify

Modified: xfcalendar/trunk/src/tray_icon.h
===================================================================
--- xfcalendar/trunk/src/tray_icon.h    2008-01-01 22:29:56 UTC (rev 26521)
+++ xfcalendar/trunk/src/tray_icon.h    2008-01-01 22:45:58 UTC (rev 26522)
@@ -1,6 +1,6 @@
 /*      Orage - Calendar and alarm handler
  *
- * Copyright (c) 2005-2007 Juha Kautto  (juha at xfce.org)
+ * Copyright (c) 2005-2008 Juha Kautto  (juha at xfce.org)
  * Copyright (c) 2004-2006 Mickael Graf (korbinus at xfce.org)
  *
  * This program is free software; you can redistribute it and/or modify

_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

Reply via email to