summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2001-03-14 20:18:03 +0000
committerTor Lillqvist <tml@src.gnome.org>2001-03-14 20:18:03 +0000
commitf6e325b2175759ade3d068c51b611fba77960735 (patch)
tree76b30afff3fc513e6b9c823dff5abb517068f150
parent009942e1ace7ace3fdc22ab8fff6b8e57ef040db (diff)
From Edward M. Lee <tailbert@yahoo.com>:
2001-03-13 Tor Lillqvist <tml@iki.fi> From Edward M. Lee <tailbert@yahoo.com>: * gdate.c (g_date_set_parse): add support for dates that in the form "Wed Mar 14 2001". Running testgdate on cygwin requires this. 2001-03-13 Tor Lillqvist <tml@iki.fi> From Edward M. Lee <tailbert@yahoo.com>: * gmodule-win32.c (_g_module_build_path): use (cygwin friendly) dir separator.
-rw-r--r--ChangeLog7
-rw-r--r--ChangeLog.pre-2-07
-rw-r--r--ChangeLog.pre-2-107
-rw-r--r--ChangeLog.pre-2-127
-rw-r--r--ChangeLog.pre-2-27
-rw-r--r--ChangeLog.pre-2-47
-rw-r--r--ChangeLog.pre-2-67
-rw-r--r--ChangeLog.pre-2-87
-rw-r--r--gdate.c7
-rw-r--r--glib/gdate.c7
-rw-r--r--gmodule/ChangeLog7
-rw-r--r--gmodule/gmodule-win32.c4
12 files changed, 79 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 9f9843d53..521c6d3ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-03-13 Tor Lillqvist <tml@iki.fi>
+
+ From Edward M. Lee <tailbert@yahoo.com>:
+
+ * gdate.c (g_date_set_parse): add support for dates that in the
+ form "Wed Mar 14 2001". Running testgdate on cygwin requires this.
+
Fri Mar 9 18:01:43 2001 Tim Janik <timj@gtk.org>
* gscanner.[hc]: made config arg to g_scanner_new() const.
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 9f9843d53..521c6d3ff 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,10 @@
+2001-03-13 Tor Lillqvist <tml@iki.fi>
+
+ From Edward M. Lee <tailbert@yahoo.com>:
+
+ * gdate.c (g_date_set_parse): add support for dates that in the
+ form "Wed Mar 14 2001". Running testgdate on cygwin requires this.
+
Fri Mar 9 18:01:43 2001 Tim Janik <timj@gtk.org>
* gscanner.[hc]: made config arg to g_scanner_new() const.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 9f9843d53..521c6d3ff 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+2001-03-13 Tor Lillqvist <tml@iki.fi>
+
+ From Edward M. Lee <tailbert@yahoo.com>:
+
+ * gdate.c (g_date_set_parse): add support for dates that in the
+ form "Wed Mar 14 2001". Running testgdate on cygwin requires this.
+
Fri Mar 9 18:01:43 2001 Tim Janik <timj@gtk.org>
* gscanner.[hc]: made config arg to g_scanner_new() const.
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 9f9843d53..521c6d3ff 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,10 @@
+2001-03-13 Tor Lillqvist <tml@iki.fi>
+
+ From Edward M. Lee <tailbert@yahoo.com>:
+
+ * gdate.c (g_date_set_parse): add support for dates that in the
+ form "Wed Mar 14 2001". Running testgdate on cygwin requires this.
+
Fri Mar 9 18:01:43 2001 Tim Janik <timj@gtk.org>
* gscanner.[hc]: made config arg to g_scanner_new() const.
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 9f9843d53..521c6d3ff 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+2001-03-13 Tor Lillqvist <tml@iki.fi>
+
+ From Edward M. Lee <tailbert@yahoo.com>:
+
+ * gdate.c (g_date_set_parse): add support for dates that in the
+ form "Wed Mar 14 2001". Running testgdate on cygwin requires this.
+
Fri Mar 9 18:01:43 2001 Tim Janik <timj@gtk.org>
* gscanner.[hc]: made config arg to g_scanner_new() const.
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 9f9843d53..521c6d3ff 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+2001-03-13 Tor Lillqvist <tml@iki.fi>
+
+ From Edward M. Lee <tailbert@yahoo.com>:
+
+ * gdate.c (g_date_set_parse): add support for dates that in the
+ form "Wed Mar 14 2001". Running testgdate on cygwin requires this.
+
Fri Mar 9 18:01:43 2001 Tim Janik <timj@gtk.org>
* gscanner.[hc]: made config arg to g_scanner_new() const.
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 9f9843d53..521c6d3ff 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+2001-03-13 Tor Lillqvist <tml@iki.fi>
+
+ From Edward M. Lee <tailbert@yahoo.com>:
+
+ * gdate.c (g_date_set_parse): add support for dates that in the
+ form "Wed Mar 14 2001". Running testgdate on cygwin requires this.
+
Fri Mar 9 18:01:43 2001 Tim Janik <timj@gtk.org>
* gscanner.[hc]: made config arg to g_scanner_new() const.
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 9f9843d53..521c6d3ff 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+2001-03-13 Tor Lillqvist <tml@iki.fi>
+
+ From Edward M. Lee <tailbert@yahoo.com>:
+
+ * gdate.c (g_date_set_parse): add support for dates that in the
+ form "Wed Mar 14 2001". Running testgdate on cygwin requires this.
+
Fri Mar 9 18:01:43 2001 Tim Janik <timj@gtk.org>
* gscanner.[hc]: made config arg to g_scanner_new() const.
diff --git a/gdate.c b/gdate.c
index 708c4705b..c3018ec90 100644
--- a/gdate.c
+++ b/gdate.c
@@ -749,6 +749,13 @@ g_date_set_parse (GDate *d,
if (using_twodigit_years && y < 100)
y = G_DATE_BAD_YEAR; /* avoids ambiguity */
}
+ else if (pt.num_ints == 2)
+ {
+ if (m == G_DATE_BAD_MONTH && pt.month != G_DATE_BAD_MONTH)
+ {
+ m = pt.month;
+ }
+ }
}
else if (pt.num_ints == 1)
{
diff --git a/glib/gdate.c b/glib/gdate.c
index 708c4705b..c3018ec90 100644
--- a/glib/gdate.c
+++ b/glib/gdate.c
@@ -749,6 +749,13 @@ g_date_set_parse (GDate *d,
if (using_twodigit_years && y < 100)
y = G_DATE_BAD_YEAR; /* avoids ambiguity */
}
+ else if (pt.num_ints == 2)
+ {
+ if (m == G_DATE_BAD_MONTH && pt.month != G_DATE_BAD_MONTH)
+ {
+ m = pt.month;
+ }
+ }
}
else if (pt.num_ints == 1)
{
diff --git a/gmodule/ChangeLog b/gmodule/ChangeLog
index a3d05d773..c7d24483b 100644
--- a/gmodule/ChangeLog
+++ b/gmodule/ChangeLog
@@ -1,3 +1,10 @@
+2001-03-13 Tor Lillqvist <tml@iki.fi>
+
+ From Edward M. Lee <tailbert@yahoo.com>:
+
+ * gmodule-win32.c (_g_module_build_path): use (cygwin friendly) dir
+ separator.
+
2001-03-12 Tor Lillqvist <tml@iki.fi>
* Makefile.am (libgplugin_a_la_LIBADD, libgplugin_b_la_LIBADD):
diff --git a/gmodule/gmodule-win32.c b/gmodule/gmodule-win32.c
index 0f5aca719..c665329d7 100644
--- a/gmodule/gmodule-win32.c
+++ b/gmodule/gmodule-win32.c
@@ -253,9 +253,9 @@ _g_module_build_path (const gchar *directory,
k = strlen (module_name);
if (directory && *directory)
if (k > 4 && g_strcasecmp (module_name + k - 4, ".dll") == 0)
- return g_strconcat (directory, "\\", module_name, NULL);
+ return g_strconcat (directory, G_DIR_SEPARATOR_S, module_name, NULL);
else
- return g_strconcat (directory, "\\", module_name, ".dll", NULL);
+ return g_strconcat (directory, G_DIR_SEPARATOR_S, module_name, ".dll", NULL);
else if (k > 4 && g_strcasecmp (module_name + k - 4, ".dll") == 0)
return g_strdup (module_name);
else