diff options
| author | Darin Adler <darin@src.gnome.org> | 2001-04-12 19:33:07 +0000 |
|---|---|---|
| committer | Darin Adler <darin@src.gnome.org> | 2001-04-12 19:33:07 +0000 |
| commit | c0246e2f8d5d2cf2e170cd0980436aae7e3ef985 (patch) | |
| tree | 4aaf4620e2eeb6c57d0736d9ef831325bacbdaf1 /libnautilus-private | |
| parent | 0bd24fee46775c0a142954a51ad14720d3ecb3cc (diff) | |
| download | nautilus-c0246e2f8d5d2cf2e170cd0980436aae7e3ef985.tar.gz | |
Get rid of stray % character.
* libnautilus-extensions/nautilus-file.c:
Get rid of stray % character.
* src/file-manager/fm-directory-view.c: (remove_debuting_uri),
(debuting_uri_add_file_callback), (copy_move_done_partition_func):
Fix bug I introduced with my last check-in, where we try to g_free
a GINT_TO_POINTER(TRUE).
Diffstat (limited to 'libnautilus-private')
| -rw-r--r-- | libnautilus-private/nautilus-file.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libnautilus-private/nautilus-file.c b/libnautilus-private/nautilus-file.c index 8bd2b7c23..a7bb72ca7 100644 --- a/libnautilus-private/nautilus-file.c +++ b/libnautilus-private/nautilus-file.c @@ -2245,6 +2245,7 @@ const char *TODAY_TIME_FORMATS [] = { N_("today"), N_("today"), + NULL }; @@ -2263,6 +2264,7 @@ const char *YESTERDAY_TIME_FORMATS [] = { N_("yesterday"), N_("yesterday"), + NULL }; @@ -2272,7 +2274,7 @@ const char *CURRENT_WEEK_TIME_FORMATS [] = { * The width measurement templates correspond to * the day/month name with the most letters. */ - N_("Wednesday, September 00 0000 at %00:00:00 PM"), + N_("Wednesday, September 00 0000 at 00:00:00 PM"), N_("%A, %B %-d %Y at %-I:%M:%S %p"), N_("Mon, Oct 00 0000 at 00:00:00 PM"), @@ -2332,7 +2334,6 @@ nautilus_file_fit_date_as_string (NautilusFile *file, g_date_free (file_date); g_date_free (today); - /* Format varies depending on how old the date is. This minimizes * the length (and thus clutter & complication) of typical dates * while providing sufficient detail for recent dates to make @@ -2386,7 +2387,7 @@ nautilus_file_fit_date_as_string (NautilusFile *file, break; } - if ((measure_callback) (width_template, measure_context) <= width) { + if ((* measure_callback) (width_template, measure_context) <= width) { /* The template fits, this is the format we can fit. */ break; } |