[Xfce4-commits] r25315 - xfcalendar/trunk/src

[Juha Kautto]

Author: juha
Date: 2007-03-27 20:34:02 +0000 (Tue, 27 Mar 2007)
New Revision: 25315

Modified:
   xfcalendar/trunk/src/interface.c
   xfcalendar/trunk/src/main.c
   xfcalendar/trunk/src/tray_icon.c
Log:
 import and foreign file add/remove events update main window and alarms.


Modified: xfcalendar/trunk/src/interface.c
===================================================================
--- xfcalendar/trunk/src/interface.c    2007-03-27 20:05:54 UTC (rev 25314)
+++ xfcalendar/trunk/src/interface.c    2007-03-27 20:34:02 UTC (rev 25315)
@@ -409,7 +409,13 @@
 
 gboolean orage_import_file(gchar *entry_filename) 
 {
-    return(xfical_import_file(entry_filename));
+    if (xfical_import_file(entry_filename)) {
+        orage_mark_appointments();
+        xfical_alarm_build_list(FALSE);
+        return(TRUE);
+    }
+    else
+        return(FALSE);
 }
 
 gboolean orage_export_file(gchar *entry_filename, gint count, gchar *uids) 
@@ -528,6 +534,8 @@
     g_par.foreign_data[i].file = NULL;
 
     write_parameters();
+    orage_mark_appointments();
+    xfical_alarm_build_list(FALSE);
 }
 
 gboolean orage_foreign_file_remove(gchar *filename)
@@ -616,7 +624,6 @@
         gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 5);
     }
     gtk_widget_show_all(intf_w->for_cur_frame);
-    orage_mark_appointments();
 }
 
 gboolean orage_foreign_file_add_internal(gchar *filename, gboolean read_only)
@@ -648,9 +655,12 @@
     g_par.foreign_count++;
 
     write_parameters();
+    orage_mark_appointments();
+    xfical_alarm_build_list(FALSE);
     return(TRUE);
 }
 
+/* this is used from command line */
 gboolean orage_foreign_file_add(gchar *filename, gboolean read_only)
 {
     if (interface_lock) {

Modified: xfcalendar/trunk/src/main.c
===================================================================
--- xfcalendar/trunk/src/main.c 2007-03-27 20:05:54 UTC (rev 25314)
+++ xfcalendar/trunk/src/main.c 2007-03-27 20:34:02 UTC (rev 25315)
@@ -59,7 +59,6 @@
 #endif
 
 /* defined in interface.c */
-gboolean orage_import_file(gchar *entry_filename);
 gboolean orage_foreign_file_add(gchar *filename, gboolean read_only);
 gboolean orage_foreign_file_remove(gchar *filename);
 

Modified: xfcalendar/trunk/src/tray_icon.c
===================================================================
--- xfcalendar/trunk/src/tray_icon.c    2007-03-27 20:05:54 UTC (rev 25314)
+++ xfcalendar/trunk/src/tray_icon.c    2007-03-27 20:34:02 UTC (rev 25315)
@@ -63,15 +63,15 @@
 }
 
 void 
-on_preferences_activate                (GtkMenuItem     *menuitem,
-                                        gpointer         user_data)
+on_preferences_activate(GtkMenuItem *menuitem
+        , gpointer user_data)
 {
     show_parameters();
 }
 
 void
-on_new_appointment_activate            (GtkMenuItem     *menuitem,
-                                        gpointer         user_data)
+on_new_appointment_activate(GtkMenuItem *menuitem
+        , gpointer user_data)
 {
     appt_win *app;
     struct tm *t;

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