"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "jpilot-merge.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.

jpilot-merge.c  (jpilot-1.8.2):jpilot-merge.c  (jpilot-2_0_1)
skipping to change at line 60 skipping to change at line 60
#include "otherconv.h" #include "otherconv.h"
#include "libplugin.h" #include "libplugin.h"
#include "sync.h" #include "sync.h"
/******************************* Global vars **********************************/ /******************************* Global vars **********************************/
/* Start Hack */ /* Start Hack */
/* FIXME: The following is a hack. /* FIXME: The following is a hack.
* The variables below are global variables in jpilot.c which are unused in * The variables below are global variables in jpilot.c which are unused in
* this code but must be instantiated for the code to compile. * this code but must be instantiated for the code to compile.
* The same is true of the functions which are only used in GUI mode. */ * The same is true of the functions which are only used in GUI mode. */
int pipe_to_parent = 0;
pid_t jpilot_master_pid = -1; pid_t jpilot_master_pid = -1;
GtkWidget *glob_dialog; GtkWidget *glob_dialog;
GtkWidget *glob_date_label; GtkWidget *glob_date_label;
gint glob_date_timer_tag; gint glob_date_timer_tag;
void output_to_pane(const char *str) {} void output_to_pane(const char *str) {}
int sync_once(struct my_sync_info *sync_info) { return EXIT_SUCCESS; } int sync_once(struct my_sync_info *sync_info) { return EXIT_SUCCESS; }
int jp_pack_Contact(struct Contact *c, pi_buffer_t *buf) { return 0; } int jp_pack_Contact(struct Contact *c, pi_buffer_t *buf) { return 0; }
int edit_cats(GtkWidget *widget, char *db_name, struct CategoryAppInfo *cai) int edit_cats(GtkWidget *widget, char *db_name, struct CategoryAppInfo *cai)
{ {
skipping to change at line 286 skipping to change at line 287
{ {
/* enable internationalization(i18n) before printing any output */ /* enable internationalization(i18n) before printing any output */
#if defined(ENABLE_NLS) #if defined(ENABLE_NLS)
# ifdef HAVE_LOCALE_H # ifdef HAVE_LOCALE_H
setlocale(LC_ALL, ""); setlocale(LC_ALL, "");
# endif # endif
bindtextdomain(EPN, LOCALEDIR); bindtextdomain(EPN, LOCALEDIR);
textdomain(EPN); textdomain(EPN);
#endif #endif
if (argc != 3) { if (argc != 4) {
fprintf(stderr, _("Usage: %s {input pdb file} {input pc3 file} {output pdb file}\n"), argv[0]); fprintf(stderr, _("Usage: %s {input pdb file} {input pc3 file} {output pdb file}\n"), argv[0]);
fprintf(stderr, _(" This program will merge an unsynced records file (pc3 )\n")); fprintf(stderr, _(" This program will merge an unsynced records file (pc3 )\n"));
fprintf(stderr, _(" into the corresponding palm database (pdb) file.\n\n" )); fprintf(stderr, _(" into the corresponding palm database (pdb) file.\n\n" ));
fprintf(stderr, _(" WARNING: Only run this utility if you understand the consequences!\n")); fprintf(stderr, _(" WARNING: Only run this utility if you understand the consequences!\n"));
fprintf(stderr, _(" The merge will leave your databases in an unsync-able state.\n")); fprintf(stderr, _(" The merge will leave your databases in an unsync-able state.\n"));
fprintf(stderr, _(" It is intended for cases where J-pilot is being used as a standalone PIM\n")); fprintf(stderr, _(" It is intended for cases where J-pilot is being used as a standalone PIM\n"));
fprintf(stderr, _(" and where no syncing occurs to physical hardware.\n") ); fprintf(stderr, _(" and where no syncing occurs to physical hardware.\n") );
fprintf(stderr, _(" WARNING: Make a backup copy of your databases before proceeding.\n")); fprintf(stderr, _(" WARNING: Make a backup copy of your databases before proceeding.\n"));
fprintf(stderr, _(" It is quite simple to destroy your databases by accid entally merging\n")); fprintf(stderr, _(" It is quite simple to destroy your databases by accid entally merging\n"));
fprintf(stderr, _(" address records into datebook databases, etc.\n")); fprintf(stderr, _(" address records into datebook databases, etc.\n"));
 End of changes. 2 change blocks. 
1 lines changed or deleted 2 lines changed or added

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