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

2007-12-20 Thread Juha Kautto
Author: juha
Date: 2007-12-20 22:03:37 + (Thu, 20 Dec 2007)
New Revision: 26496

Modified:
   xfcalendar/trunk/src/day-view.c
   xfcalendar/trunk/src/functions.c
Log:
removed debug code from day_view


Modified: xfcalendar/trunk/src/day-view.c
===
--- xfcalendar/trunk/src/day-view.c 2007-12-19 22:48:12 UTC (rev 26495)
+++ xfcalendar/trunk/src/day-view.c 2007-12-20 22:03:37 UTC (rev 26496)
@@ -513,7 +513,6 @@
 xfical_appt *appt;
 int days = 1;
 
-program_log(\tapp_rows start);
 days = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(dw-day_spin));
 /* xfical_appt_get_next_on_day uses extra days so to show 7 days we need
  * to pass days=6, which means 6 days in addition to the one */
@@ -525,7 +524,6 @@
 add_row(dw, appt, a_day, days);
 xfical_appt_free(appt);
 }
-program_log(\tapp_rows end);
 }
 
 static void app_data(day_win *dw)
@@ -535,16 +533,13 @@
 gint i;
 gchar a_day[9]; /* mmdd */
 
-program_log(\tapp_data start);
 ical_type = XFICAL_TYPE_EVENT;
 strcpy(a_day, orage_i18_date_to_icaltime(gtk_button_get_label(
 GTK_BUTTON(dw-StartDate_button;
 
 /* first search base orage file */
-program_log(\tapp_data before open);
 if (!xfical_file_open(TRUE))
 return;
-program_log(\tapp_data after open);
 strcpy(file_type, O00.);
 app_rows(dw, a_day, ical_type, file_type);
 /* then process all foreign files */
@@ -552,7 +547,6 @@
 app_rows(dw, a_day, ical_type, file_type);
 }
 xfical_file_close(TRUE);
-program_log(\tapp_data done);
 }
 
 
@@ -562,7 +556,6 @@
 GtkWidget *ev, *hb;
 GtkWidget *marker;
 
-program_log(fill_days started);
 height = dw-StartDate_button_req.height;
 width = dw-StartDate_button_req.width;
 
@@ -617,7 +610,6 @@
  , (GTK_FILL), (0), 0, 0);
 }
 }
-program_log(fill_days done);
 }
 
 static void build_day_view_header(day_win *dw, char *start_date)
@@ -834,26 +826,19 @@
 
 static void refresh_day_view_table(day_win *dw)
 {
-program_log(* refresh_day_view_table started);
 get_scroll_position(dw);
 gtk_widget_destroy(dw-scroll_win_h);
-program_log(* refresh_day_view_table destroyed);
 build_day_view_table(dw);
-program_log(* refresh_day_view_table built);
 gtk_widget_show_all(dw-scroll_win_h);
-gtk_widget_show_now(dw-scroll_win_h);
-program_log(* refresh_day_view_table showed);
 /* I was not able to get this work without the timer. Ugly yes, but
  * it works and does not hurt - much */
 g_timeout_add(100, (GtkFunction)scroll_position_timer, (gpointer)dw);
-program_log(* refresh_day_view_table done);
 }
 
 day_win *create_day_win(char *start_date)
 {
 day_win *dw;
 
-program_log(create_day_win started);
 /* initialisation + main window + base vbox */
 dw = g_new0(day_win, 1);
 dw-scroll_pos = -1; /* not set */
@@ -872,16 +857,11 @@
 
 build_menu(dw);
 build_toolbar(dw);
-program_log(create_day_win toolbar done);
 build_day_view_colours(dw);
 build_day_view_header(dw, start_date);
-program_log(create_day_win header done);
 build_day_view_table(dw);
-program_log(create_day_win table done);
 gtk_widget_show_all(dw-Window);
-program_log(create_day_win show done);
 set_scroll_position(dw);
-program_log(create_day_win done);
 
 return(dw);
 }

Modified: xfcalendar/trunk/src/functions.c
===
--- xfcalendar/trunk/src/functions.c2007-12-19 22:48:12 UTC (rev 26495)
+++ xfcalendar/trunk/src/functions.c2007-12-20 22:03:37 UTC (rev 26496)
@@ -52,6 +52,7 @@
  * grep MARK /tmp/logfile.strace
  * grep MARK /tmp/logfile.strace|sed s/, F_OK) = -1 ENOENT (No such file or 
directory)//
  * */
+/*
 void program_log (const char *format, ...)
 {
 va_list args;
@@ -67,8 +68,8 @@
 access (str, F_OK);
 g_free (str);
 }
+*/
 
-
 GtkWidget *orage_create_combo_box_with_content(char *text[], int size)
 {
 register int i;

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


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

2007-12-20 Thread Juha Kautto
Author: juha
Date: 2007-12-20 23:49:14 + (Thu, 20 Dec 2007)
New Revision: 26497

Modified:
   xfcalendar/trunk/src/interface.c
   xfcalendar/trunk/src/parameters.c
Log:
Fixed two small memory leaks.
libical file open still leaks, but that is hard to fix.


Modified: xfcalendar/trunk/src/interface.c
===
--- xfcalendar/trunk/src/interface.c2007-12-20 22:03:37 UTC (rev 26496)
+++ xfcalendar/trunk/src/interface.c2007-12-20 23:49:14 UTC (rev 26497)
@@ -106,11 +106,6 @@
 return(FALSE);
 }
 
-static void on_destroy(GtkWidget *window, gpointer user_data)
-{
- interface_lock = FALSE;
-}
-
 void static orage_file_entry_changed(GtkWidget *dialog, gpointer user_data)
 {
 intf_win *intf_w = (intf_win *)user_data;
@@ -729,7 +724,9 @@
 intf_win *intf_w = (intf_win *)user_data;
 
 gtk_widget_destroy(intf_w-main_window);
+gtk_object_destroy(GTK_OBJECT(intf_w-tooltips));
 g_free(intf_w);
+interface_lock = FALSE;
 }
 
 void close_button_clicked(GtkButton *button, gpointer user_data)
@@ -742,6 +739,13 @@
 close_intf_w(user_data);
 }
 
+static gboolean on_Window_delete_event(GtkWidget *w, GdkEvent *e
+, gpointer user_data)
+{
+close_intf_w(user_data);
+return(FALSE);
+}
+
 void create_menu(intf_win *intf_w)
 {
 /*
@@ -1315,8 +1319,8 @@
 create_orage_file_tab(intf_w);
 create_foreign_file_tab(intf_w);
 
- g_signal_connect(G_OBJECT(intf_w-main_window), destroy,
- G_CALLBACK(on_destroy), NULL);
+ g_signal_connect((gpointer)intf_w-main_window, delete_event,
+ G_CALLBACK(on_Window_delete_event), intf_w);
 
 gtk_widget_show_all(intf_w-main_window);
 drag_and_drop_init(intf_w);

Modified: xfcalendar/trunk/src/parameters.c
===
--- xfcalendar/trunk/src/parameters.c   2007-12-20 22:03:37 UTC (rev 26496)
+++ xfcalendar/trunk/src/parameters.c   2007-12-20 23:49:14 UTC (rev 26497)
@@ -820,7 +820,7 @@
 
 void read_parameters(void)
 {
-gchar *fpath;
+gchar *fpath, *fpath2;
 XfceRc *rc;
 gint i;
 gchar f_par[100];
@@ -841,11 +841,14 @@
 g_strdup(xfce_rc_read_entry(rc, Timezone, floating));
 #ifdef HAVE_ARCHIVE
 g_par.archive_limit = xfce_rc_read_int_entry(rc, Archive limit, 0);
-g_par.archive_file = g_strdup(xfce_rc_read_entry(rc, Archive file
-, orage_resource_file_location(ORAGE_DIR ARCFILE)));
+fpath2 = orage_resource_file_location(ORAGE_DIR ARCFILE);
+g_par.archive_file = 
+g_strdup(xfce_rc_read_entry(rc, Archive file, fpath2));
+g_free(fpath2);
 #endif
-g_par.orage_file = g_strdup(xfce_rc_read_entry(rc, Orage file
-, orage_resource_file_location(ORAGE_DIR APPFILE)));
+fpath2 = orage_resource_file_location(ORAGE_DIR APPFILE);
+g_par.orage_file = g_strdup(xfce_rc_read_entry(rc, Orage file, fpath2));
+g_free(fpath2);
 g_par.sound_application = 
 g_strdup(xfce_rc_read_entry(rc, Sound application, play));
 g_par.pos_x = xfce_rc_read_int_entry(rc, Main window X, 0);

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