r15611 - gnucash/trunk/src/gnome - Use the Recurrences for the SX frequency, not the FreqSpec list.

Josh Sled jsled at cvs.gnucash.org
Sun Feb 18 18:14:19 EST 2007


Author: jsled
Date: 2007-02-18 18:14:17 -0500 (Sun, 18 Feb 2007)
New Revision: 15611
Trac: http://svn.gnucash.org/trac/changeset/15611

Modified:
   gnucash/trunk/src/gnome/gnc-sx-list-tree-model-adapter.c
Log:
Use the Recurrences for the SX frequency, not the FreqSpec list.


Modified: gnucash/trunk/src/gnome/gnc-sx-list-tree-model-adapter.c
===================================================================
--- gnucash/trunk/src/gnome/gnc-sx-list-tree-model-adapter.c	2007-02-18 22:54:11 UTC (rev 15610)
+++ gnucash/trunk/src/gnome/gnc-sx-list-tree-model-adapter.c	2007-02-18 23:14:17 UTC (rev 15611)
@@ -490,14 +490,11 @@
      for (list = model->instances->sx_instance_list; list != NULL; list = list->next)
      {
           GncSxInstances *instances = (GncSxInstances*)list->data;
-          FreqSpec *fs;
-          GString *frequency_str;
+          gchar *frequency_str;
           char last_occur_date_buf[MAX_DATE_LENGTH+1];
           char next_occur_date_buf[MAX_DATE_LENGTH+1];
 
-          frequency_str = g_string_sized_new(32);
-          fs = xaccSchedXactionGetFreqSpec(instances->sx);
-          xaccFreqSpecGetFreqStr(fs, frequency_str);
+          frequency_str = recurrenceListToString(gnc_sx_get_schedule(instances->sx));
 
           _format_conditional_date(xaccSchedXactionGetLastOccurDate(instances->sx),
                                    last_occur_date_buf, MAX_DATE_LENGTH);
@@ -508,11 +505,11 @@
           gtk_tree_store_set(model->orig, &iter,
                              SXLTMA_COL_NAME, xaccSchedXactionGetName(instances->sx),
                              SXLTMA_COL_ENABLED, xaccSchedXactionGetEnabled(instances->sx),
-                             SXLTMA_COL_FREQUENCY, frequency_str->str,
+                             SXLTMA_COL_FREQUENCY, frequency_str,
                              SXLTMA_COL_LAST_OCCUR, last_occur_date_buf,
                              SXLTMA_COL_NEXT_OCCUR, next_occur_date_buf,
                              -1);
-          g_string_free(frequency_str, TRUE);
+          g_free(frequency_str);
      }
 }
 



More information about the gnucash-changes mailing list