"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "print.c" between
jpilot-1.8.2.tar.gz and jpilot-2_0_1.tar.gz

About: J-Pilot is a desktop organizer application for Palm Pilot (PalmOS) devices. Ported to GTK3.

print.c  (jpilot-1.8.2):print.c  (jpilot-2_0_1)
skipping to change at line 421 skipping to change at line 421
CalendarEventList *temp_cel; CalendarEventList *temp_cel;
struct tm date; struct tm date;
char desc[100]; char desc[100];
time_t ltime; time_t ltime;
int dow; int dow;
int ndim; int ndim;
int n; int n;
long fdow; long fdow;
int mask; int mask;
#ifdef ENABLE_DATEBK #ifdef ENABLE_DATEBK
int ret;
int cat_bit; int cat_bit;
int db3_type; int db3_type;
long use_db3_tags; long use_db3_tags;
struct db4_struct db4; struct db4_struct db4;
#endif #endif
#ifdef HAVE_LOCALE_H #ifdef HAVE_LOCALE_H
char *current_locale; char *current_locale;
#endif #endif
/*------------------------------------------------------------------ /*------------------------------------------------------------------
skipping to change at line 516 skipping to change at line 515
date.tm_yday=1; date.tm_yday=1;
mktime(&date); mktime(&date);
fprintf(out, "%%--------------------------------------------------\n" fprintf(out, "%%--------------------------------------------------\n"
"%%Stuff for day %2d being printed\n", date.tm_mday); "%%Stuff for day %2d being printed\n", date.tm_mday);
fprintf(out, "NextDay\n"); fprintf(out, "NextDay\n");
for (temp_cel = ce_list; temp_cel; temp_cel=temp_cel->next) { for (temp_cel = ce_list; temp_cel; temp_cel=temp_cel->next) {
#ifdef ENABLE_DATEBK #ifdef ENABLE_DATEBK
if (use_db3_tags) { if (use_db3_tags) {
ret = db3_parse_tag(temp_cel->mcale.cale.note, &db3_type, &db4); db3_parse_tag(temp_cel->mcale.cale.note, &db3_type, &db4);
/* jp_logf(JP_LOG_DEBUG, "category = 0x%x\n", db4.category); */ /* jp_logf(JP_LOG_DEBUG, "category = 0x%x\n", db4.category); */
cat_bit=1<<db4.category; cat_bit=1<<db4.category;
if (!(cat_bit & datebk_category)) { if (!(cat_bit & datebk_category)) {
jp_logf(JP_LOG_DEBUG, "skipping rec not in this category\n"); jp_logf(JP_LOG_DEBUG, "skipping rec not in this category\n");
continue; continue;
} }
} }
#endif #endif
if (calendar_isApptOnDate(&(temp_cel->mcale.cale), &date)) { if (calendar_isApptOnDate(&(temp_cel->mcale.cale), &date)) {
char tmp[20]; char tmp[20];
skipping to change at line 633 skipping to change at line 632
int print_weeks_appts(struct tm *date_in, PaperSize paper_size) int print_weeks_appts(struct tm *date_in, PaperSize paper_size)
{ {
CalendarEventList *ce_list, *temp_cel; CalendarEventList *ce_list, *temp_cel;
struct tm date; struct tm date;
struct tm *today_date; struct tm *today_date;
char desc[256], short_date[32]; char desc[256], short_date[32];
int n; int n;
time_t ltime; time_t ltime;
#ifdef ENABLE_DATEBK #ifdef ENABLE_DATEBK
int ret;
int cat_bit; int cat_bit;
int db3_type; int db3_type;
long use_db3_tags; long use_db3_tags;
struct db4_struct db4; struct db4_struct db4;
#endif #endif
#ifdef HAVE_LOCALE_H #ifdef HAVE_LOCALE_H
char *current_locale; char *current_locale;
#endif #endif
#ifdef ENABLE_DATEBK #ifdef ENABLE_DATEBK
skipping to change at line 699 skipping to change at line 697
*------------------------------------------------------------------*/ *------------------------------------------------------------------*/
ce_list = NULL; ce_list = NULL;
get_days_calendar_events2(&ce_list, NULL, 2, 2, 2, CATEGORY_ALL, NULL); get_days_calendar_events2(&ce_list, NULL, 2, 2, 2, CATEGORY_ALL, NULL);
reset_first_last(); reset_first_last();
memcpy(&date, date_in, sizeof(struct tm)); memcpy(&date, date_in, sizeof(struct tm));
for (n = 0; n < 7; n++, add_days_to_date(&date, 1)) { for (n = 0; n < 7; n++, add_days_to_date(&date, 1)) {
for (temp_cel = ce_list; temp_cel; temp_cel=temp_cel->next) { for (temp_cel = ce_list; temp_cel; temp_cel=temp_cel->next) {
#ifdef ENABLE_DATEBK #ifdef ENABLE_DATEBK
if (use_db3_tags) { if (use_db3_tags) {
ret = db3_parse_tag(temp_cel->mcale.cale.note, &db3_type, &db4); db3_parse_tag(temp_cel->mcale.cale.note, &db3_type, &db4);
cat_bit=1<<db4.category; cat_bit=1<<db4.category;
if (!(cat_bit & datebk_category)) continue; if (!(cat_bit & datebk_category)) continue;
} }
#endif #endif
if (calendar_isApptOnDate(&(temp_cel->mcale.cale), &date)) if (calendar_isApptOnDate(&(temp_cel->mcale.cale), &date))
if (! temp_cel->mcale.cale.event) if (! temp_cel->mcale.cale.event)
check_first_last(temp_cel); check_first_last(temp_cel);
} }
} }
if (last_min > 0) last_hour++; if (last_min > 0) last_hour++;
skipping to change at line 747 skipping to change at line 745
/* iterate through seven days */ /* iterate through seven days */
memcpy(&date, date_in, sizeof(struct tm)); memcpy(&date, date_in, sizeof(struct tm));
for (n = 0; n < 7; n++, add_days_to_date(&date, 1)) { for (n = 0; n < 7; n++, add_days_to_date(&date, 1)) {
strftime(short_date, sizeof(short_date), "%a, %d %b, %Y", &date); strftime(short_date, sizeof(short_date), "%a, %d %b, %Y", &date);
fprintf(out, "%d startday\n(%s) dateline\n", n, short_date); fprintf(out, "%d startday\n(%s) dateline\n", n, short_date);
for (temp_cel = ce_list; temp_cel; temp_cel=temp_cel->next) { for (temp_cel = ce_list; temp_cel; temp_cel=temp_cel->next) {
#ifdef ENABLE_DATEBK #ifdef ENABLE_DATEBK
if (use_db3_tags) { if (use_db3_tags) {
ret = db3_parse_tag(temp_cel->mcale.cale.note, &db3_type, &db4); db3_parse_tag(temp_cel->mcale.cale.note, &db3_type, &db4);
jp_logf(JP_LOG_DEBUG, "category = 0x%x\n", db4.category); jp_logf(JP_LOG_DEBUG, "category = 0x%x\n", db4.category);
cat_bit=1<<db4.category; cat_bit=1<<db4.category;
if (!(cat_bit & datebk_category)) { if (!(cat_bit & datebk_category)) {
jp_logf(JP_LOG_DEBUG, "skip rec not in this category\n"); jp_logf(JP_LOG_DEBUG, "skip rec not in this category\n");
continue; continue;
} }
} }
#endif #endif
if (calendar_isApptOnDate(&(temp_cel->mcale.cale), &date)) { if (calendar_isApptOnDate(&(temp_cel->mcale.cale), &date)) {
memset(desc, 0, sizeof(desc)); memset(desc, 0, sizeof(desc));
 End of changes. 5 change blocks. 
5 lines changed or deleted 3 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)