Update of /cvsroot/gtkpod/gtkpod/src
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv21449/src
Modified Files:
clientserver.c date_parser.l date_parser2.l display_sorttabs.c
file_itunesdb.c misc_confirm.c tools.c
Log Message:
* src/clientserver.c
src/date_parser.l
src/date_parser2.l
src/display_sorttabs.c
src/file_itunesdb.c
src/misc_confirm.c
src/tools.c: corrected typo (occured -> occurred)
Index: clientserver.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/clientserver.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- clientserver.c 24 Nov 2006 06:48:25 -0000 1.14
+++ clientserver.c 18 Jan 2007 16:54:07 -0000 1.15
@@ -1,4 +1,4 @@
-/* Time-stamp: <2006-11-23 00:45:43 jcs>
+/* Time-stamp: <2007-01-19 01:52:30 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -270,7 +270,7 @@
running instance of gtkpod and transfer the filename, or write the
name to ~/.gtkpod/offline_playcounts.
Return value: TRUE on success, FALSE if a non-recoverable error
- occured */
+ occurred */
gboolean client_playcount (gchar *file)
{
if (socket_used ())
Index: date_parser.l
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/date_parser.l,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- date_parser.l 29 Apr 2005 04:01:16 -0000 1.10
+++ date_parser.l 18 Jan 2007 16:54:07 -0000 1.11
@@ -1,5 +1,5 @@
/* -*- mode: c -*-
-| Time-stamp: <2005-04-29 12:13:19 jcs>
+| Time-stamp: <2007-01-19 01:52:29 jcs>
|
| Copyright (C) 2002-2003 Jorg Schuler <jcsjcs at users.sourceforge.net>
| Part of the gtkpod project.
@@ -430,8 +430,8 @@
*
* Return value:
*
- * TRUE: no error occured
- * FALSE: error occured
+ * TRUE: no error occurred
+ * FALSE: error occurred
*/
gboolean dp_parse (gchar *dp_str, time_t *result,
gboolean lower_margin, gboolean strict)
@@ -443,7 +443,7 @@
parsed_time = FALSE;
/* did not yet parse any relative time string */
reltime = DP_INF;
- /* no error occured (yet) */
+ /* no error occurred (yet) */
dp_error = FALSE;
/* set parameters */
lower = lower_margin;
Index: date_parser2.l
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/date_parser2.l,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- date_parser2.l 29 Apr 2005 04:01:15 -0000 1.11
+++ date_parser2.l 18 Jan 2007 16:54:07 -0000 1.12
@@ -1,5 +1,5 @@
/* -*- mode: c -*-
-| Time-stamp: <2005-04-29 12:13:18 jcs>
+| Time-stamp: <2007-01-19 01:52:29 jcs>
|
| Copyright (C) 2002-2003 Jorg Schuler <jcsjcs at users.sourceforge.net>
| Part of the gtkpod project.
@@ -31,7 +31,7 @@
#include "date_parser.h"
#include "misc.h"
#include "itdb.h"
-/* Will be set to TRUE if error occured */
+/* Will be set to TRUE if error occurred */
static gboolean dp_error;
/* Will be set to TRUE if construct (< date, = date...) was not
recognized */
@@ -201,7 +201,7 @@
gchar *str = g_strdup_printf ("%s\n", ti->int_str);
/* set string to parse */
dp_strp = str;
- /* no error occured (yet) */
+ /* no error occurred (yet) */
dp_error = FALSE;
dp_construct_error = FALSE;
/* set interval type to normal */
@@ -216,13 +216,13 @@
gtkpod_warning ("Date parser: did not recognize construct:\n '%s'\n",
ti->int_str);
if (dp_error)
- { /* error occured -> invalidate TimeInfo */
+ { /* error occurred -> invalidate TimeInfo */
ti->valid = FALSE;
ti->lower = 0;
ti->upper = 0;
}
else
- { /* no error occured -> set the information accordingly */
+ { /* no error occurred -> set the information accordingly */
ti->valid = TRUE;
if (dp_int_type & INT_NO_LOWER) ti->lower = 0;
else ti->lower = itdb_time_host_to_mac (lower_stamp);
Index: display_sorttabs.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/display_sorttabs.c,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -d -r1.86 -r1.87
--- display_sorttabs.c 16 Jan 2007 10:22:40 -0000 1.86
+++ display_sorttabs.c 18 Jan 2007 16:54:07 -0000 1.87
@@ -1,4 +1,4 @@
-/* Time-stamp: <2007-01-16 19:20:13 jcs>
+/* Time-stamp: <2007-01-19 01:52:28 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -379,7 +379,7 @@
has changed. TRUE will re-evaluate the string (and print an error
message again, if necessary */
/* Return value: pointer to the corresponding TimeInfo struct (for
- convenience) or NULL if error occured */
+ convenience) or NULL if error occurred */
TimeInfo *sp_update_date_interval_from_string (guint32 inst,
T_item item,
gboolean force_update)
Index: file_itunesdb.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/file_itunesdb.c,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -d -r1.105 -r1.106
--- file_itunesdb.c 18 Jan 2007 16:16:43 -0000 1.105
+++ file_itunesdb.c 18 Jan 2007 16:54:07 -0000 1.106
@@ -1,4 +1,4 @@
-/* Time-stamp: <2007-01-19 00:56:32 jcs>
+/* Time-stamp: <2007-01-19 01:52:28 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -943,7 +943,7 @@
*
* @itdb: repository to save
*
- * return value: TRUE on succes, FALSE when an error occured.
+ * return value: TRUE on succes, FALSE when an error occurred.
*/
gboolean gp_save_itdb (iTunesDB *itdb)
{
@@ -1332,7 +1332,7 @@
/* Removes all tracks that were marked for deletion from the iPod or
the local harddisk (for itdb->usertype == GP_ITDB_TYPE_LOCAL) */
-/* Returns TRUE on success, FALSE if some error occured and not all
+/* Returns TRUE on success, FALSE if some error occurred and not all
files were removed */
static gboolean delete_files (iTunesDB *itdb)
{
@@ -1440,7 +1440,7 @@
/* Flushes all non-transferred tracks to the iPod filesystem
- Returns TRUE on success, FALSE if some error occured or not all
+ Returns TRUE on success, FALSE if some error occurred or not all
tracks were written. */
static gboolean flush_tracks (iTunesDB *itdb)
{
@@ -1515,7 +1515,7 @@
error = th_copy (track);
#endif
if (error)
- { /* an error occured */
+ { /* an error occurred */
result = FALSE;
if (error->message)
gtkpod_warning ("%s\n\n", error->message);
@@ -1680,7 +1680,7 @@
{ /* write to the iPod */
GError *error = NULL;
if (!itdb_write (itdb, &error))
- { /* an error occured */
+ { /* an error occurred */
success = FALSE;
if (error && error->message)
gtkpod_warning ("%s\n\n", error->message);
@@ -1693,7 +1693,7 @@
if (success)
{ /* write shuffle data */
if (!itdb_shuffle_write (itdb, &error))
- { /* an error occured */
+ { /* an error occurred */
success = FALSE;
if (error && error->message)
gtkpod_warning ("%s\n\n", error->message);
@@ -1759,7 +1759,7 @@
{ /* write to cfgdir */
GError *error = NULL;
if (!itdb_write_file (itdb, eitdb->offline_filename, &error))
- { /* an error occured */
+ { /* an error occurred */
success = FALSE;
if (error && error->message)
gtkpod_warning ("%s\n\n", error->message);
@@ -1779,7 +1779,7 @@
{ /* write to cfgdir */
GError *error = NULL;
if (!itdb_write_file (itdb, NULL, &error))
- { /* an error occured */
+ { /* an error occurred */
success = FALSE;
if (error && error->message)
gtkpod_warning ("%s\n\n", error->message);
Index: misc_confirm.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/misc_confirm.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- misc_confirm.c 24 Sep 2006 12:16:26 -0000 1.44
+++ misc_confirm.c 18 Jan 2007 16:54:07 -0000 1.45
@@ -1,4 +1,4 @@
-/* Time-stamp: <2006-09-24 20:49:39 jcs>
+/* Time-stamp: <2007-01-19 01:52:28 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -69,7 +69,7 @@
gtkpod_confirmation (CONF_ID_GTKPOD_WARNING, /* gint id, */
FALSE, /* gboolean modal, */
_("Warning"), /* title */
- _("The following has occured:"),
+ _("The following has occurred:"),
text, /* text to be displayed */
NULL, 0, NULL, /* option 1 */
NULL, 0, NULL, /* option 2 */
Index: tools.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/tools.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- tools.c 16 Jan 2007 09:45:00 -0000 1.50
+++ tools.c 18 Jan 2007 16:54:07 -0000 1.51
@@ -1,4 +1,4 @@
-/* Time-stamp: <2006-06-24 01:38:20 jcs>
+/* Time-stamp: <2007-01-19 01:52:28 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -80,7 +80,7 @@
* added at the end.
*
* Return value: TRUE if the command ran successfully, FALSE if any
- * error occured.
+ * error occurred.
*/
static gboolean run_exec_on_track (const gchar *commandline,
const gchar *track_path)
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
