From 5dd0868f9e9e540ab0aaadc9d3cdf6b795db4863 Mon Sep 17 00:00:00 2001 From: Yevgen Muntyan <17531749+muntyan@users.noreply.github.com> Date: Sun, 7 Nov 2010 02:19:19 -0800 Subject: [PATCH] Removed moocompat.* --- LICENSE | 16 - moo/eggsmclient/eggdesktopfile.h | 1 - moo/mooedit/mooedit.c | 1 - moo/mooedit/mooeditaction-factory.c | 1 - moo/mooedit/mooeditconfig.h | 8 - moo/mooedit/mooeditdialogs.c | 1 - moo/mooedit/mooeditwindow.c | 1 - moo/mooedit/moolineview.c | 2 +- moo/moofileview/moofile.c | 1 - moo/mooutils/Makefile.incl | 2 - moo/mooutils/mooactionfactory.h | 8 - moo/mooutils/mooatom.h | 1 - moo/mooutils/moocompat.c | 816 ---------------------------- moo/mooutils/moocompat.h | 110 ---- moo/mooutils/moodialogs.c | 1 - moo/mooutils/mooi18n.c | 1 - moo/mooutils/moospawn.c | 1 - moo/mooutils/moostock.c | 1 - moo/mooutils/mooutils-fs.c | 1 - moo/mooutils/mooutils-gobject.h | 8 - moo/mooutils/moowindow.c | 1 - moo/plugins/moofilelist.c | 1 - po/POTFILES.in | 1 - po/medit-1.pot | 271 +++++---- 24 files changed, 134 insertions(+), 1122 deletions(-) delete mode 100644 moo/mooutils/moocompat.c delete mode 100644 moo/mooutils/moocompat.h diff --git a/LICENSE b/LICENSE index 61287894..7aa3ea49 100644 --- a/LICENSE +++ b/LICENSE @@ -80,22 +80,6 @@ moo/xdg-utils: (C) 2006 Kevin Krammer (C) 2006 Jeremy White -moo/mooutils/newgtk/glib-2.8/glib/gmappedfile.[ch]: -moo/mooutils/newgtk/glib-2.12/glib/gbase64.[ch]: -moo/mooutils/newgtk/glib-2.14/glib/gregex.[ch]: -moo/mooutils/moocompat.[ch]: - Gtk and Glib code for older systems - Copyright 2000 Red Hat, Inc. - Copyright 2001,2005 Red Hat, Inc. - Copyright (C) 1995-1998 Peter Mattis, Spencer Kimball and Josh MacDonald - Copyright (C) 1999, 2000 Scott Wimer - Copyright (C) 2004, Matthias Clasen - Copyright (C) 2005 - 2007, Marco Barisione - Copyright (C) 2005 Alexander Larsson - Copyright (C) 2006 Alexander Larsson - Copyright (C) 2000-2003 Ximian Inc. - Copyright 2005 Matthias Clasen - moo/mooutils/pixmaps/medit.png: xedit.png icon from Crystal Clear icon theme by Everaldo Coelho, http://www.everaldo.com diff --git a/moo/eggsmclient/eggdesktopfile.h b/moo/eggsmclient/eggdesktopfile.h index f570fec8..711bfd43 100644 --- a/moo/eggsmclient/eggdesktopfile.h +++ b/moo/eggsmclient/eggdesktopfile.h @@ -21,7 +21,6 @@ #define __EGG_DESKTOP_FILE_H__ #include -#include "mooutils/moocompat.h" G_BEGIN_DECLS diff --git a/moo/mooedit/mooedit.c b/moo/mooedit/mooedit.c index efbed690..dc4ceb6c 100644 --- a/moo/mooedit/mooedit.c +++ b/moo/mooedit/mooedit.c @@ -27,7 +27,6 @@ #include "mooedit/mooedit-tests.h" #include "marshals.h" #include "mooutils/mooutils-fs.h" -#include "mooutils/moocompat.h" #include "mooutils/mooi18n.h" #include "mooutils/mooutils-misc.h" #include "mooutils/mootype-macros.h" diff --git a/moo/mooedit/mooeditaction-factory.c b/moo/mooedit/mooeditaction-factory.c index d3d29c19..2d382c2d 100644 --- a/moo/mooedit/mooeditaction-factory.c +++ b/moo/mooedit/mooeditaction-factory.c @@ -23,7 +23,6 @@ #include "mooutils/moomenuaction.h" #include "mooutils/mooi18n.h" #include "mooutils/mootype-macros.h" -#include "mooutils/moocompat.h" #include #include diff --git a/moo/mooedit/mooeditconfig.h b/moo/mooedit/mooeditconfig.h index 9d52dc89..b58562a6 100644 --- a/moo/mooedit/mooeditconfig.h +++ b/moo/mooedit/mooeditconfig.h @@ -19,14 +19,6 @@ #include #include -#ifndef G_GNUC_NULL_TERMINATED -#if __GNUC__ >= 4 -#define G_GNUC_NULL_TERMINATED __attribute__((__sentinel__)) -#else -#define G_GNUC_NULL_TERMINATED -#endif -#endif - G_BEGIN_DECLS diff --git a/moo/mooedit/mooeditdialogs.c b/moo/mooedit/mooeditdialogs.c index b8540baa..aff4c10c 100644 --- a/moo/mooedit/mooeditdialogs.c +++ b/moo/mooedit/mooeditdialogs.c @@ -18,7 +18,6 @@ #include "mooedit/mooeditprefs.h" #include "mooedit/mooedit-fileops.h" #include "mooutils/moodialogs.h" -#include "mooutils/moocompat.h" #include "mooutils/moostock.h" #include "mooutils/mooi18n.h" #include "mooutils/mooencodings.h" diff --git a/moo/mooedit/mooeditwindow.c b/moo/mooedit/mooeditwindow.c index c3f90a03..7d55bcb9 100644 --- a/moo/mooedit/mooeditwindow.c +++ b/moo/mooedit/mooeditwindow.c @@ -36,7 +36,6 @@ #include "mooutils/moomenuaction.h" #include "mooutils/mooutils-misc.h" #include "mooutils/moodialogs.h" -#include "mooutils/moocompat.h" #include "mooutils/mooi18n.h" #include "mooutils/mooaction-private.h" #include "mooutils/moofiledialog.h" diff --git a/moo/mooedit/moolineview.c b/moo/mooedit/moolineview.c index 3bb02abc..6e0a04f7 100644 --- a/moo/mooedit/moolineview.c +++ b/moo/mooedit/moolineview.c @@ -17,7 +17,7 @@ #include "marshals.h" #include "mooutils/mooutils-gobject.h" #include "mooutils/mooutils-messages.h" -#include "mooutils/moocompat.h" +#include #include diff --git a/moo/moofileview/moofile.c b/moo/moofileview/moofile.c index f59bf3db..7037703c 100644 --- a/moo/moofileview/moofile.c +++ b/moo/moofileview/moofile.c @@ -30,7 +30,6 @@ #include "mooutils/mootype-macros.h" #include "mooutils/mooutils-debug.h" #include "mooutils/moostat.h" -#include "mooutils/moocompat.h" #include "marshals.h" #include "mooutils/moo-mime.h" #include diff --git a/moo/mooutils/Makefile.incl b/moo/mooutils/Makefile.incl index 15e7e7b9..feca6ac3 100644 --- a/moo/mooutils/Makefile.incl +++ b/moo/mooutils/Makefile.incl @@ -33,8 +33,6 @@ moo_sources += \ mooutils/mooclosure.h \ mooutils/moocombo.c \ mooutils/moocombo.h \ - mooutils/moocompat.c \ - mooutils/moocompat.h \ mooutils/moodialogs.c \ mooutils/moodialogs.h \ mooutils/mooeditops.c \ diff --git a/moo/mooutils/mooactionfactory.h b/moo/mooutils/mooactionfactory.h index 64c02154..a0af15ba 100644 --- a/moo/mooutils/mooactionfactory.h +++ b/moo/mooutils/mooactionfactory.h @@ -18,14 +18,6 @@ #include -#ifndef G_GNUC_NULL_TERMINATED -#if __GNUC__ >= 4 -#define G_GNUC_NULL_TERMINATED __attribute__((__sentinel__)) -#else -#define G_GNUC_NULL_TERMINATED -#endif -#endif - G_BEGIN_DECLS diff --git a/moo/mooutils/mooatom.h b/moo/mooutils/mooatom.h index a7125e07..bb18439e 100644 --- a/moo/mooutils/mooatom.h +++ b/moo/mooutils/mooatom.h @@ -17,7 +17,6 @@ #define MOO_ATOM_H #include -#include G_BEGIN_DECLS diff --git a/moo/mooutils/moocompat.c b/moo/mooutils/moocompat.c deleted file mode 100644 index 8654aa94..00000000 --- a/moo/mooutils/moocompat.c +++ /dev/null @@ -1,816 +0,0 @@ -/* - * moocompat.c - * - * Copyright (C) 2004-2010 by Yevgen Muntyan - * - * This file is part of medit. medit is free software; you can - * redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License as published by the - * Free Software Foundation; either version 2.1 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public - * License along with medit. If not, see . - */ - -/* - * Some functions here are taken from GTK+ and GLIB (http://gtk.org/) - * - * g_mkdir_with_parents and g_file_set_contents are taken from glib/gfileutils.c; - * it's Copyright 2000 Red Hat, Inc. - * - * g_utf8_collate_key_for_filename is from glib/gunicollate.c: - * it's Copyright 2001,2005 Red Hat, Inc. - * - * g_listenv function is taken from glib/gutils.c; - * it's Copyright (C) 1995-1998 Peter Mattis, Spencer Kimball and Josh MacDonald - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif -#include "mooutils/moocompat.h" -#include "mooutils/moo-environ.h" - -#ifdef HAVE_UNISTD_H -#include -#endif - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#ifdef G_OS_WIN32 -#include -#include -#endif /* G_OS_WIN32 */ - -#ifndef S_ISLNK -#define S_ISLNK(x) 0 -#endif - -#ifndef O_BINARY -#define O_BINARY 0 -#endif - - -#if !GLIB_CHECK_VERSION(2,8,0) - -int -g_mkdir_with_parents (const gchar *pathname, - int mode) -{ - gchar *fn, *p; - - if (pathname == NULL || *pathname == '\0') - { - errno = EINVAL; - return -1; - } - - fn = g_strdup (pathname); - - if (g_path_is_absolute (fn)) - p = (gchar *) g_path_skip_root (fn); - else - p = fn; - - do - { - while (*p && !G_IS_DIR_SEPARATOR (*p)) - p++; - - if (!*p) - p = NULL; - else - *p = '\0'; - - if (!g_file_test (fn, G_FILE_TEST_EXISTS)) - { - if (g_mkdir (fn, mode) == -1) - { - int errno_save = errno; - g_free (fn); - errno = errno_save; - return -1; - } - } - else if (!g_file_test (fn, G_FILE_TEST_IS_DIR)) - { - g_free (fn); - errno = ENOTDIR; - return -1; - } - if (p) - { - *p++ = G_DIR_SEPARATOR; - while (*p && G_IS_DIR_SEPARATOR (*p)) - p++; - } - } - while (p); - - g_free (fn); - - return 0; -} - - -/* - * create_temp_file based on the mkstemp implementation from the GNU C library. - * Copyright (C) 1991,92,93,94,95,96,97,98,99 Free Software Foundation, Inc. - */ -static gint -create_temp_file (gchar *tmpl, - int permissions) -{ - char *XXXXXX; - int count, fd; - static const char letters[] = - "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; - static const int NLETTERS = sizeof (letters) - 1; - glong value; - GTimeVal tv; - static int counter = 0; - - /* find the last occurrence of "XXXXXX" */ - XXXXXX = g_strrstr (tmpl, "XXXXXX"); - - if (!XXXXXX || strncmp (XXXXXX, "XXXXXX", 6)) - { - errno = EINVAL; - return -1; - } - - /* Get some more or less random data. */ - g_get_current_time (&tv); - value = (tv.tv_usec ^ tv.tv_sec) + counter++; - - for (count = 0; count < 100; value += 7777, ++count) - { - glong v = value; - - /* Fill in the random bits. */ - XXXXXX[0] = letters[v % NLETTERS]; - v /= NLETTERS; - XXXXXX[1] = letters[v % NLETTERS]; - v /= NLETTERS; - XXXXXX[2] = letters[v % NLETTERS]; - v /= NLETTERS; - XXXXXX[3] = letters[v % NLETTERS]; - v /= NLETTERS; - XXXXXX[4] = letters[v % NLETTERS]; - v /= NLETTERS; - XXXXXX[5] = letters[v % NLETTERS]; - - /* tmpl is in UTF-8 on Windows, thus use g_open() */ - fd = g_open (tmpl, O_RDWR | O_CREAT | O_EXCL | O_BINARY, permissions); - - if (fd >= 0) - return fd; - else if (errno != EEXIST) - /* Any other error will apply also to other names we might - * try, and there are 2^32 or so of them, so give up now. - */ - return -1; - } - - /* We got out of the loop because we ran out of combinations to try. */ - errno = EEXIST; - return -1; -} - -static gboolean -rename_file (const char *old_name, - const char *new_name, - GError **err) -{ - errno = 0; - if (g_rename (old_name, new_name) == -1) - { - int save_errno = errno; - gchar *display_old_name = g_filename_display_name (old_name); - gchar *display_new_name = g_filename_display_name (new_name); - - g_set_error (err, - G_FILE_ERROR, - g_file_error_from_errno (save_errno), - "Failed to rename file '%s' to '%s': g_rename() failed: %s", - display_old_name, - display_new_name, - g_strerror (save_errno)); - - g_free (display_old_name); - g_free (display_new_name); - - return FALSE; - } - - return TRUE; -} - -static gchar * -write_to_temp_file (const gchar *contents, - gssize length, - const gchar *template, - GError **err) -{ - gchar *tmp_name; - gchar *display_name; - gchar *retval; - FILE *file; - gint fd; - int save_errno; - - retval = NULL; - - tmp_name = g_strdup_printf ("%s.XXXXXX", template); - - errno = 0; - fd = create_temp_file (tmp_name, 0666); - display_name = g_filename_display_name (tmp_name); - - if (fd == -1) - { - save_errno = errno; - g_set_error (err, - G_FILE_ERROR, - g_file_error_from_errno (save_errno), - "Failed to create file '%s': %s", - display_name, g_strerror (save_errno)); - - goto out; - } - - errno = 0; - file = fdopen (fd, "wb"); - if (!file) - { - save_errno = errno; - g_set_error (err, - G_FILE_ERROR, - g_file_error_from_errno (save_errno), - "Failed to open file '%s' for writing: fdopen() failed: %s", - display_name, - g_strerror (save_errno)); - - close (fd); - g_unlink (tmp_name); - - goto out; - } - - if (length > 0) - { - gsize n_written; - - errno = 0; - - n_written = fwrite (contents, 1, length, file); - - if (n_written < (gsize) length) - { - save_errno = errno; - - g_set_error (err, - G_FILE_ERROR, - g_file_error_from_errno (save_errno), - "Failed to write file '%s': fwrite() failed: %s", - display_name, - g_strerror (save_errno)); - - fclose (file); - g_unlink (tmp_name); - - goto out; - } - } - - errno = 0; - if (fclose (file) == EOF) - { - save_errno = 0; - - g_set_error (err, - G_FILE_ERROR, - g_file_error_from_errno (save_errno), - "Failed to close file '%s': fclose() failed: %s", - display_name, - g_strerror (save_errno)); - - g_unlink (tmp_name); - - goto out; - } - - retval = g_strdup (tmp_name); - - out: - g_free (tmp_name); - g_free (display_name); - - return retval; -} - -gboolean -g_file_set_contents (const gchar *filename, - const gchar *contents, - gssize length, - GError **error) -{ - gchar *tmp_filename; - gboolean retval; - GError *rename_error = NULL; - - g_return_val_if_fail (filename != NULL, FALSE); - g_return_val_if_fail (error == NULL || *error == NULL, FALSE); - g_return_val_if_fail (contents != NULL || length == 0, FALSE); - g_return_val_if_fail (length >= -1, FALSE); - - if (length == -1) - length = strlen (contents); - - tmp_filename = write_to_temp_file (contents, length, filename, error); - - if (!tmp_filename) - { - retval = FALSE; - goto out; - } - - if (!rename_file (tmp_filename, filename, &rename_error)) - { -#ifndef G_OS_WIN32 - - g_unlink (tmp_filename); - g_propagate_error (error, rename_error); - retval = FALSE; - goto out; - -#else /* G_OS_WIN32 */ - - /* Renaming failed, but on Windows this may just mean - * the file already exists. So if the target file - * exists, try deleting it and do the rename again. - */ - if (!g_file_test (filename, G_FILE_TEST_EXISTS)) - { - g_unlink (tmp_filename); - g_propagate_error (error, rename_error); - retval = FALSE; - goto out; - } - - g_error_free (rename_error); - - if (g_unlink (filename) == -1) - { - gchar *display_filename = g_filename_display_name (filename); - - int save_errno = errno; - - g_set_error (error, - G_FILE_ERROR, - g_file_error_from_errno (save_errno), - _("Existing file '%s' could not be removed: g_unlink() failed: %s"), - display_filename, - g_strerror (save_errno)); - - g_free (display_filename); - g_unlink (tmp_filename); - retval = FALSE; - goto out; - } - - if (!rename_file (tmp_filename, filename, error)) - { - g_unlink (tmp_filename); - retval = FALSE; - goto out; - } - -#endif - } - - retval = TRUE; - - out: - g_free (tmp_filename); - return retval; -} - - -/* This is a collation key that is very very likely to sort before any - collation key that libc strxfrm generates. We use this before any - special case (dot or number) to make sure that its sorted before - anything else. - */ -#define COLLATION_SENTINEL "\1\1\1" - -gchar* -g_utf8_collate_key_for_filename (const gchar *str, - gssize len) -{ - GString *result; - GString *append; - const gchar *p; - const gchar *prev; - const gchar *end; - gchar *collate_key; - gint digits; - gint leading_zeros; - - /* - * How it works: - * - * Split the filename into collatable substrings which do - * not contain [.0-9] and special-cased substrings. The collatable - * substrings are run through the normal g_utf8_collate_key() and the - * resulting keys are concatenated with keys generated from the - * special-cased substrings. - * - * Special cases: Dots are handled by replacing them with '\1' which - * implies that short dot-delimited substrings are before long ones, - * e.g. - * - * a\1a (a.a) - * a-\1a (a-.a) - * aa\1a (aa.a) - * - * Numbers are handled by prepending to each number d-1 superdigits - * where d = number of digits in the number and SUPERDIGIT is a - * character with an integer value higher than any digit (for instance - * ':'). This ensures that single-digit numbers are sorted before - * double-digit numbers which in turn are sorted separately from - * triple-digit numbers, etc. To avoid strange side-effects when - * sorting strings that already contain SUPERDIGITs, a '\2' - * is also prepended, like this - * - * file\21 (file1) - * file\25 (file5) - * file\2:10 (file10) - * file\2:26 (file26) - * file\2::100 (file100) - * file:foo (file:foo) - * - * This has the side-effect of sorting numbers before everything else (except - * dots), but this is probably OK. - * - * Leading digits are ignored when doing the above. To discriminate - * numbers which differ only in the number of leading digits, we append - * the number of leading digits as a byte at the very end of the collation - * key. - * - * To try avoid conflict with any collation key sequence generated by libc we - * start each switch to a special cased part with a sentinel that hopefully - * will sort before anything libc will generate. - */ - - if (len < 0) - len = strlen (str); - - result = g_string_sized_new (len * 2); - append = g_string_sized_new (0); - - end = str + len; - - /* No need to use utf8 functions, since we're only looking for ascii chars */ - for (prev = p = str; p < end; p++) - { - switch (*p) - { - case '.': - if (prev != p) - { - collate_key = g_utf8_collate_key (prev, p - prev); - g_string_append (result, collate_key); - g_free (collate_key); - } - - g_string_append (result, COLLATION_SENTINEL "\1"); - - /* skip the dot */ - prev = p + 1; - break; - - case '0': - case '1': - case '2': - case '3': - case '4': - case '5': - case '6': - case '7': - case '8': - case '9': - if (prev != p) - { - collate_key = g_utf8_collate_key (prev, p - prev); - g_string_append (result, collate_key); - g_free (collate_key); - } - - g_string_append (result, COLLATION_SENTINEL "\2"); - - prev = p; - - /* write d-1 colons */ - if (*p == '0') - { - leading_zeros = 1; - digits = 0; - } - else - { - leading_zeros = 0; - digits = 1; - } - - while (++p < end) - { - if (*p == '0' && !digits) - ++leading_zeros; - else if (g_ascii_isdigit(*p)) - ++digits; - else - { - /* count an all-zero sequence as - * one digit plus leading zeros - */ - if (!digits) - { - ++digits; - --leading_zeros; - } - break; - } - } - - while (digits > 1) - { - g_string_append_c (result, ':'); - --digits; - } - - if (leading_zeros > 0) - { - g_string_append_c (append, (char)leading_zeros); - prev += leading_zeros; - } - - /* write the number itself */ - g_string_append_len (result, prev, p - prev); - - prev = p; - --p; /* go one step back to avoid disturbing outer loop */ - break; - - default: - /* other characters just accumulate */ - break; - } - } - - if (prev != p) - { - collate_key = g_utf8_collate_key (prev, p - prev); - g_string_append (result, collate_key); - g_free (collate_key); - } - - g_string_append (result, append->str); - g_string_free (append, TRUE); - - return g_string_free (result, FALSE); -} - - -gchar ** -g_listenv (void) -{ -#ifndef G_OS_WIN32 - gchar **result, *eq; - gint len, i, j; - - len = g_strv_length (environ); - result = g_new0 (gchar *, len + 1); - - j = 0; - for (i = 0; i < len; i++) - { - eq = strchr (environ[i], '='); - if (eq) - result[j++] = g_strndup (environ[i], eq - environ[i]); - } - - result[j] = NULL; - - return result; -#else - gchar **result, *eq; - gint len = 0, i, j; - - if (G_WIN32_HAVE_WIDECHAR_API ()) - { - wchar_t *p, *q; - - p = (wchar_t *) GetEnvironmentStringsW (); - if (p != NULL) - { - q = p; - while (*q) - { - q += wcslen (q) + 1; - len++; - } - } - result = g_new0 (gchar *, len + 1); - - j = 0; - q = p; - while (*q) - { - result[j] = g_utf16_to_utf8 (q, -1, NULL, NULL, NULL); - if (result[j] != NULL) - { - eq = strchr (result[j], '='); - if (eq && eq > result[j]) - { - *eq = '\0'; - j++; - } - else - g_free (result[j]); - } - q += wcslen (q) + 1; - } - result[j] = NULL; - FreeEnvironmentStringsW (p); - } - else - { - len = g_strv_length (environ); - result = g_new0 (gchar *, len + 1); - - j = 0; - for (i = 0; i < len; i++) - { - result[j] = g_locale_to_utf8 (environ[i], -1, NULL, NULL, NULL); - if (result[j] != NULL) - { - eq = strchr (result[j], '='); - if (eq && eq > result[j]) - { - *eq = '\0'; - j++; - } - else - g_free (result[j]); - } - } - result[j] = NULL; - } - - return result; -#endif -} - -#endif /* !GLIB_CHECK_VERSION(2,8,0) */ - - -#if !GTK_CHECK_VERSION(2,10,0) - -GdkAtom -gdk_atom_intern_static_string (const char *atom_name) -{ - return gdk_atom_intern (atom_name, FALSE); -} - -GType -gtk_unit_get_type (void) -{ - static GType type; - - if (G_UNLIKELY (!type)) - { - static const GEnumValue values[] = { - { GTK_UNIT_PIXEL, (char*) "GTK_UNIT_PIXEL", (char*) "pixel" }, - { GTK_UNIT_POINTS, (char*) "GTK_UNIT_POINTS", (char*) "points" }, - { GTK_UNIT_INCH, (char*) "GTK_UNIT_INCH", (char*) "inch" }, - { GTK_UNIT_MM, (char*) "GTK_UNIT_MM", (char*) "mm" }, - { 0, NULL, NULL } - }; - - type = g_enum_register_static ("GtkUnit", values); - } - - return type; -} - -#endif /* !GTK_CHECK_VERSION(2,10,0) */ - - -#if !GTK_CHECK_VERSION(2,12,0) - -static void -set_cursor_colors (GtkWidget *widget, - const GdkColor *primary, - const GdkColor *secondary) -{ - char *rc_string; - char *widget_name; - - widget_name = g_strdup_printf ("gtk-source-view-%p", (gpointer) widget); - - rc_string = g_strdup_printf ( - "style \"%p\"\n" - "{\n" - " GtkWidget::cursor-color = \"#%02x%02x%02x\"\n" - " GtkWidget::secondary-cursor-color = \"#%02x%02x%02x\"\n" - "}\n" - "widget \"*.%s\" style \"%p\"\n", - (gpointer) widget, - primary->red >> 8, primary->green >> 8, primary->blue >> 8, - secondary->red >> 8, secondary->green >> 8, secondary->blue >> 8, - widget_name, - (gpointer) widget - ); - - gtk_rc_parse_string (rc_string); - - if (strcmp (widget_name, gtk_widget_get_name (widget)) != 0) - gtk_widget_set_name (widget, widget_name); - - g_free (rc_string); - g_free (widget_name); -} - -void -gtk_widget_modify_cursor (GtkWidget *widget, - GdkColor *primary, - GdkColor *secondary) -{ - g_return_if_fail (GTK_IS_WIDGET (widget)); - g_return_if_fail (!primary || secondary); - - if (!primary) - { - primary = &widget->style->text[GTK_STATE_NORMAL], - secondary = &widget->style->text_aa[GTK_STATE_NORMAL]; - } - - set_cursor_colors (widget, primary, secondary); -} - -#endif /* !GTK_CHECK_VERSION(2,12,0) */ - - -#if !GLIB_CHECK_VERSION(2,16,0) - -#include - -const char * -g_dpgettext (const char *domain, - const char *msgctxtid, - gsize msgidoffset) -{ - const char *translation; - - translation = dgettext (domain, msgctxtid); - - if (translation == msgctxtid) - { - const char *sep; - - if (msgidoffset > 0) - return msgctxtid + msgidoffset; - - sep = strchr (msgctxtid, '|'); - - if (sep) - { - /* try with '\004' instead of '|', in case - * xgettext -kQ_:1g was used - */ - gchar *tmp = g_alloca (strlen (msgctxtid) + 1); - strcpy (tmp, msgctxtid); - tmp[sep - msgctxtid] = '\004'; - - translation = dgettext (domain, tmp); - - if (translation == tmp) - return sep + 1; - } - } - - return translation; -} - -#endif /* !GLIB_CHECK_VERSION(2,16,0) */ diff --git a/moo/mooutils/moocompat.h b/moo/mooutils/moocompat.h deleted file mode 100644 index 3ecf7654..00000000 --- a/moo/mooutils/moocompat.h +++ /dev/null @@ -1,110 +0,0 @@ -/* - * moocompat.h - * - * Copyright (C) 2004-2010 by Yevgen Muntyan - * - * This file is part of medit. medit is free software; you can - * redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License as published by the - * Free Software Foundation; either version 2.1 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public - * License along with medit. If not, see . - */ - -#ifndef MOOUTILS_COMPAT_H -#define MOOUTILS_COMPAT_H - -#include - -#ifndef __WIN32__ /* TODO */ -#include -#endif /* __WIN32__ */ - -G_BEGIN_DECLS - - -#if !GLIB_CHECK_VERSION(2,8,0) -#define g_mkdir_with_parents _moo_g_mkdir_with_parents -#define g_listenv _moo_g_listenv -#define g_utf8_collate_key_for_filename _moo_g_utf8_collate_key_for_filename -#define g_file_set_contents _moo_g_file_set_contents - -int g_mkdir_with_parents (const char *pathname, - int mode); -char **g_listenv (void); -char *g_utf8_collate_key_for_filename (const char *str, - gssize len); -gboolean g_file_set_contents (const char *filename, - const char *contents, - gssize length, - GError **error); -#if __GNUC__ >= 4 -#define G_GNUC_NULL_TERMINATED __attribute__((__sentinel__)) -#else -#define G_GNUC_NULL_TERMINATED -#endif -#endif /* !GLIB_CHECK_VERSION(2,8,0) */ - - -#if !GLIB_CHECK_VERSION(2,10,0) - -G_END_DECLS -#include "mooutils/mooutils-misc.h" -G_BEGIN_DECLS - -#define g_intern_string _moo_intern_string - -#endif /* !GLIB_CHECK_VERSION(2,10,0) */ - - -#if !GTK_CHECK_VERSION(2,10,0) - -#ifndef GTK_STOCK_SELECT_ALL -#define GTK_STOCK_SELECT_ALL "gtk-select-all" -#endif - -typedef enum { - GTK_UNIT_PIXEL, - GTK_UNIT_POINTS, - GTK_UNIT_INCH, - GTK_UNIT_MM -} GtkUnit; - -#define GTK_TYPE_UNIT (gtk_unit_get_type ()) -GType gtk_unit_get_type (void) G_GNUC_CONST; - -#define gdk_atom_intern_static_string _moo_gdk_atom_intern_static_string -GdkAtom gdk_atom_intern_static_string (const char *atom_name); - -#endif /* !GTK_CHECK_VERSION(2,10,0) */ - - -#if !GTK_CHECK_VERSION(2,12,0) - -#ifndef GTK_STOCK_DISCARD -#define GTK_STOCK_DISCARD "gtk-discard" -#endif - -#define gtk_widget_modify_cursor _moo_gtk_widget_modify_cursor -void gtk_widget_modify_cursor (GtkWidget *widget, - GdkColor *primary, - GdkColor *secondary); - -#endif /* !GTK_CHECK_VERSION(2,10,0) */ - - -#if !GLIB_CHECK_VERSION(2,16,0) - -#define g_dpgettext _moo_compat_g_dpgettext -const char *g_dpgettext (const char *domain, - const char *msgctxtid, - gsize msgidoffset); - -#endif /* !GLIB_CHECK_VERSION(2,16,0) */ - - -G_END_DECLS - -#endif /* MOOUTILS_COMPAT_H */ diff --git a/moo/mooutils/moodialogs.c b/moo/mooutils/moodialogs.c index a04895c1..9cf7c340 100644 --- a/moo/mooutils/moodialogs.c +++ b/moo/mooutils/moodialogs.c @@ -18,7 +18,6 @@ #include "mooutils/mooprefs.h" #include "mooutils/mooutils-misc.h" #include "mooutils/mooi18n.h" -#include "mooutils/moocompat.h" static GtkWidget * diff --git a/moo/mooutils/mooi18n.c b/moo/mooutils/mooi18n.c index 2a152648..a8734630 100644 --- a/moo/mooutils/mooi18n.c +++ b/moo/mooutils/mooi18n.c @@ -15,7 +15,6 @@ #include "mooutils/mooi18n.h" #include "mooutils/mooutils-misc.h" -#include "mooutils/moocompat.h" #include diff --git a/moo/mooutils/moospawn.c b/moo/mooutils/moospawn.c index a446727a..8e25d95a 100644 --- a/moo/mooutils/moospawn.c +++ b/moo/mooutils/moospawn.c @@ -16,7 +16,6 @@ #include "mooutils/moospawn.h" #include "marshals.h" #include "mooutils/mooutils-misc.h" -#include "mooutils/moocompat.h" #include #ifndef __WIN32__ diff --git a/moo/mooutils/moostock.c b/moo/mooutils/moostock.c index ffb7236d..fe49a50e 100644 --- a/moo/mooutils/moostock.c +++ b/moo/mooutils/moostock.c @@ -14,7 +14,6 @@ */ #include "mooutils/moostock.h" -#include "mooutils/moocompat.h" #include "mooutils/stock-terminal-24.h" #include "mooutils/stock-file-selector-24.h" #include "mooutils/stock-file-24.h" diff --git a/moo/mooutils/mooutils-fs.c b/moo/mooutils/mooutils-fs.c index 4d20c680..4f1778d3 100644 --- a/moo/mooutils/mooutils-fs.c +++ b/moo/mooutils/mooutils-fs.c @@ -22,7 +22,6 @@ #include "mooutils/mooutils-debug.h" #include "mooutils/mooutils-mem.h" #include "mooutils/mootype-macros.h" -#include "mooutils/moocompat.h" #include "mooutils/mooi18n.h" #include diff --git a/moo/mooutils/mooutils-gobject.h b/moo/mooutils/mooutils-gobject.h index d249eac4..b9e492ec 100644 --- a/moo/mooutils/mooutils-gobject.h +++ b/moo/mooutils/mooutils-gobject.h @@ -19,14 +19,6 @@ #include #include -#ifndef G_GNUC_NULL_TERMINATED -#if __GNUC__ >= 4 -#define G_GNUC_NULL_TERMINATED __attribute__((__sentinel__)) -#else -#define G_GNUC_NULL_TERMINATED -#endif -#endif - G_BEGIN_DECLS diff --git a/moo/mooutils/moowindow.c b/moo/mooutils/moowindow.c index a08099e0..0ebd6422 100644 --- a/moo/mooutils/moowindow.c +++ b/moo/mooutils/moowindow.c @@ -20,7 +20,6 @@ #include "mooutils/mooaccelprefs.h" #include "mooutils/mooaccel.h" #include "mooutils/mooprefs.h" -#include "mooutils/moocompat.h" #include "marshals.h" #include "mooutils/moostock.h" #include "mooutils/mooactionfactory.h" diff --git a/moo/plugins/moofilelist.c b/moo/plugins/moofilelist.c index 37c7450b..0f416c8c 100644 --- a/moo/plugins/moofilelist.c +++ b/moo/plugins/moofilelist.c @@ -21,7 +21,6 @@ #include "mooutils/mooutils-misc.h" #include "mooutils/mooutils-treeview.h" #include "mooutils/mooutils-fs.h" -#include "mooutils/moocompat.h" #include "mooutils/mooatom.h" #include #include diff --git a/po/POTFILES.in b/po/POTFILES.in index f5f63c1c..75d58d59 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -38,7 +38,6 @@ moo/moofileview/moofileview-tools.c moo/moofileview/moofileview.xml moo/mooutils/glade/mooaccelprefs.glade moo/mooutils/mooaccelprefs.c -moo/mooutils/moocompat.c moo/mooutils/moodialogs.c moo/mooutils/mooencodings.c moo/mooutils/mooencodings-data.h diff --git a/po/medit-1.pot b/po/medit-1.pot index 47de0a04..48694f4d 100644 --- a/po/medit-1.pot +++ b/po/medit-1.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-24 23:49-0700\n" +"POT-Creation-Date: 2010-11-07 02:18-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -167,7 +167,7 @@ msgstr "" #. Translators: this goes into About box, under Translated by tab, #. do not ignore it, markup isn't always used. It should be something #. like "Some Guy ", with lines separated by \n -#: ../moo/mooapp/mooappabout.c:66 +#: ../moo/mooapp/mooappabout.c:57 msgid "translator-credits" msgstr "" @@ -175,16 +175,16 @@ msgstr "" #. this must be valid html markup, e.g. #. "Some Guy <someguy@domain.net>" #. Lines must be separated by
, like "First guy
Second Guy" -#: ../moo/mooapp/mooappabout.c:71 +#: ../moo/mooapp/mooappabout.c:62 msgid "translator-credits-markup" msgstr "" -#: ../moo/mooapp/mooapp.c:973 +#: ../moo/mooapp/mooapp.c:979 msgid "Report a Bug..." msgstr "" #. Prefs dialog title, like "medit Preferences" -#: ../moo/mooapp/mooapp.c:1398 +#: ../moo/mooapp/mooapp.c:1404 #, c-format msgid "%s Preferences" msgstr "" @@ -456,7 +456,7 @@ msgid "lines" msgstr "" #: ../moo/mooedit/glade/mooprintpreview.glade.h:1 -#: ../moo/mooedit/mooeditwindow.c:687 ../moo/mooedit/mooeditwindow.c:688 +#: ../moo/mooedit/mooeditwindow.c:686 ../moo/mooedit/mooeditwindow.c:687 msgid "Print..." msgstr "" @@ -521,7 +521,7 @@ msgid "Whole words only" msgstr "" #: ../moo/mooedit/glade/mootextfind-prompt.glade.h:1 -#: ../moo/mooedit/mooeditwindow.c:472 +#: ../moo/mooedit/mooeditwindow.c:471 msgid "Find _Next" msgstr "" @@ -542,7 +542,7 @@ msgid "_Replace" msgstr "" #: ../moo/mooedit/glade/mootextgotoline.glade.h:1 -#: ../moo/mooedit/mooeditwindow.c:522 +#: ../moo/mooedit/mooeditwindow.c:521 msgid "Go to Line" msgstr "" @@ -586,7 +586,7 @@ msgstr "" #. Translators: number of documents here is always greater than one, so #. ignore singular form (which is simply copy of the plural here) -#: ../moo/mooedit/mooeditdialogs.c:383 +#: ../moo/mooedit/mooeditdialogs.c:382 #, c-format msgid "" "There are %u documents with unsaved changes. Save changes before closing?" @@ -596,55 +596,55 @@ msgstr[0] "" msgstr[1] "" #. Could not save file foo.txt -#: ../moo/mooedit/mooeditdialogs.c:438 +#: ../moo/mooedit/mooeditdialogs.c:437 #, c-format msgid "" "Could not save file\n" "%s" msgstr "" -#: ../moo/mooedit/mooeditdialogs.c:440 +#: ../moo/mooedit/mooeditdialogs.c:439 msgid "Could not save file" msgstr "" #. Error saving file foo.txt -#: ../moo/mooedit/mooeditdialogs.c:462 +#: ../moo/mooedit/mooeditdialogs.c:461 #, c-format msgid "" "Error saving file\n" "%s" msgstr "" -#: ../moo/mooedit/mooeditdialogs.c:464 +#: ../moo/mooedit/mooeditdialogs.c:463 msgid "Error saving file" msgstr "" -#: ../moo/mooedit/mooeditdialogs.c:466 +#: ../moo/mooedit/mooeditdialogs.c:465 #, c-format msgid "" "Could not convert file to encoding %s. File was saved in UTF-8 encoding." msgstr "" #. Could not open file foo.txt -#: ../moo/mooedit/mooeditdialogs.c:491 +#: ../moo/mooedit/mooeditdialogs.c:490 #, c-format msgid "" "Could not open file\n" "%s" msgstr "" -#: ../moo/mooedit/mooeditdialogs.c:493 +#: ../moo/mooedit/mooeditdialogs.c:492 msgid "Could not open file" msgstr "" -#: ../moo/mooedit/mooeditdialogs.c:499 +#: ../moo/mooedit/mooeditdialogs.c:498 #, c-format msgid "" "Could not open file using character encoding %s. The file may be binary or " "encoding may be specified incorrectly." msgstr "" -#: ../moo/mooedit/mooeditdialogs.c:503 +#: ../moo/mooedit/mooeditdialogs.c:502 #, c-format msgid "" "Could not detect file character encoding. Please make sure the file is not " @@ -652,49 +652,49 @@ msgid "" msgstr "" #. Could not reload file foo.txt -#: ../moo/mooedit/mooeditdialogs.c:538 +#: ../moo/mooedit/mooeditdialogs.c:537 #, c-format msgid "" "Could not reload file\n" "%s" msgstr "" -#: ../moo/mooedit/mooeditdialogs.c:598 +#: ../moo/mooedit/mooeditdialogs.c:597 #, c-format msgid "Discard changes in file '%s'?" msgstr "" -#: ../moo/mooedit/mooeditdialogs.c:600 +#: ../moo/mooedit/mooeditdialogs.c:599 msgid "If you reload the document, changes will be discarded" msgstr "" -#: ../moo/mooedit/mooeditdialogs.c:601 ../moo/mooedit/mooeditwindow.c:380 +#: ../moo/mooedit/mooeditdialogs.c:600 ../moo/mooedit/mooeditwindow.c:379 msgid "_Reload" msgstr "" -#: ../moo/mooedit/mooeditdialogs.c:622 +#: ../moo/mooedit/mooeditdialogs.c:621 #, c-format msgid "Overwrite modified file '%s'?" msgstr "" -#: ../moo/mooedit/mooeditdialogs.c:623 +#: ../moo/mooedit/mooeditdialogs.c:622 #, c-format msgid "" "File '%s' was modified on disk by another process. If you save it, changes " "on disk will be lost." msgstr "" -#: ../moo/mooedit/mooeditdialogs.c:625 +#: ../moo/mooedit/mooeditdialogs.c:624 msgid "Over_write" msgstr "" -#: ../moo/mooedit/mooeditdialogs.c:646 +#: ../moo/mooedit/mooeditdialogs.c:645 msgid "" "Beginning of document reached.\n" "Continue from the end?" msgstr "" -#: ../moo/mooedit/mooeditdialogs.c:649 +#: ../moo/mooedit/mooeditdialogs.c:648 msgid "" "End of document reached.\n" "Continue from the beginning?" @@ -761,307 +761,307 @@ msgstr "" msgid "PreferencesPage|Langs" msgstr "" -#: ../moo/mooedit/mooeditwindow.c:363 +#: ../moo/mooedit/mooeditwindow.c:362 msgid "Create new document" msgstr "" -#: ../moo/mooedit/mooeditwindow.c:371 +#: ../moo/mooedit/mooeditwindow.c:370 msgid "_Open..." msgstr "" -#: ../moo/mooedit/mooeditwindow.c:372 +#: ../moo/mooedit/mooeditwindow.c:371 msgid "Open..." msgstr "" -#: ../moo/mooedit/mooeditwindow.c:379 ../moo/moofileview/moofileview.c:1283 +#: ../moo/mooedit/mooeditwindow.c:378 ../moo/moofileview/moofileview.c:1283 #: ../moo/moofileview/moofileview.c:1284 msgid "Reload" msgstr "" -#: ../moo/mooedit/mooeditwindow.c:381 +#: ../moo/mooedit/mooeditwindow.c:380 msgid "Reload document" msgstr "" -#: ../moo/mooedit/mooeditwindow.c:412 +#: ../moo/mooedit/mooeditwindow.c:411 msgid "Save _As..." msgstr "" -#: ../moo/mooedit/mooeditwindow.c:413 +#: ../moo/mooedit/mooeditwindow.c:412 msgid "Save as..." msgstr "" -#: ../moo/mooedit/mooeditwindow.c:423 +#: ../moo/mooedit/mooeditwindow.c:422 msgid "Close document" msgstr "" -#: ../moo/mooedit/mooeditwindow.c:431 +#: ../moo/mooedit/mooeditwindow.c:430 msgid "Close All" msgstr "" -#: ../moo/mooedit/mooeditwindow.c:432 +#: ../moo/mooedit/mooeditwindow.c:431 msgid "Close A_ll" msgstr "" -#: ../moo/mooedit/mooeditwindow.c:433 +#: ../moo/mooedit/mooeditwindow.c:432 msgid "Close all documents" msgstr "" -#: ../moo/mooedit/mooeditwindow.c:440 +#: ../moo/mooedit/mooeditwindow.c:439 msgid "Previous Tab" msgstr "" -#: ../moo/mooedit/mooeditwindow.c:441 +#: ../moo/mooedit/mooeditwindow.c:440 msgid "_Previous Tab" msgstr "" -#: ../moo/mooedit/mooeditwindow.c:442 +#: ../moo/mooedit/mooeditwindow.c:441 msgid "Previous tab" msgstr "" -#: ../moo/mooedit/mooeditwindow.c:450 +#: ../moo/mooedit/mooeditwindow.c:449 msgid "Next Tab" msgstr "" -#: ../moo/mooedit/mooeditwindow.c:451 +#: ../moo/mooedit/mooeditwindow.c:450 msgid "_Next Tab" msgstr "" -#: ../moo/mooedit/mooeditwindow.c:452 +#: ../moo/mooedit/mooeditwindow.c:451 msgid "Next tab" msgstr "" -#: ../moo/mooedit/mooeditwindow.c:471 +#: ../moo/mooedit/mooeditwindow.c:470 msgid "Find Next" msgstr "" -#: ../moo/mooedit/mooeditwindow.c:473 +#: ../moo/mooedit/mooeditwindow.c:472 msgid "Find next" msgstr "" -#: ../moo/mooedit/mooeditwindow.c:482 +#: ../moo/mooedit/mooeditwindow.c:481 msgid "Find Previous" msgstr "" -#: ../moo/mooedit/mooeditwindow.c:483 +#: ../moo/mooedit/mooeditwindow.c:482 msgid "Find _Previous" msgstr "" -#: ../moo/mooedit/mooeditwindow.c:484 +#: ../moo/mooedit/mooeditwindow.c:483 msgid "Find previous" msgstr "" -#: ../moo/mooedit/mooeditwindow.c:504 +#: ../moo/mooedit/mooeditwindow.c:503 msgid "Find Current Word" msgstr "" -#: ../moo/mooedit/mooeditwindow.c:505 +#: ../moo/mooedit/mooeditwindow.c:504 msgid "Find Current _Word" msgstr "" -#: ../moo/mooedit/mooeditwindow.c:513 +#: ../moo/mooedit/mooeditwindow.c:512 msgid "Find Current Word Backwards" msgstr "" -#: ../moo/mooedit/mooeditwindow.c:514 +#: ../moo/mooedit/mooeditwindow.c:513 msgid "Find Current Word _Backwards" msgstr "" -#: ../moo/mooedit/mooeditwindow.c:523 +#: ../moo/mooedit/mooeditwindow.c:522 msgid "_Go to Line..." msgstr "" -#: ../moo/mooedit/mooeditwindow.c:524 +#: ../moo/mooedit/mooeditwindow.c:523 msgid "Go to line..." msgstr "" -#: ../moo/mooedit/mooeditwindow.c:533 +#: ../moo/mooedit/mooeditwindow.c:532 msgid "Toggle Text Wrapping" msgstr "" -#: ../moo/mooedit/mooeditwindow.c:534 +#: ../moo/mooedit/mooeditwindow.c:533 msgid "_Wrap Text" msgstr "" -#: ../moo/mooedit/mooeditwindow.c:541 +#: ../moo/mooedit/mooeditwindow.c:540 msgid "Toggle Line Numbers Display" msgstr "" -#: ../moo/mooedit/mooeditwindow.c:542 +#: ../moo/mooedit/mooeditwindow.c:541 msgid "_Show Line Numbers" msgstr "" -#: ../moo/mooedit/mooeditwindow.c:548 +#: ../moo/mooedit/mooeditwindow.c:547 msgid "Focus Document" msgstr "" -#: ../moo/mooedit/mooeditwindow.c:549 +#: ../moo/mooedit/mooeditwindow.c:548 msgid "_Focus Document" msgstr "" -#: ../moo/mooedit/mooeditwindow.c:595 +#: ../moo/mooedit/mooeditwindow.c:594 msgid "Toggle Bookmark" msgstr "" -#: ../moo/mooedit/mooeditwindow.c:596 +#: ../moo/mooedit/mooeditwindow.c:595 msgid "Toggle _Bookmark" msgstr "" -#: ../moo/mooedit/mooeditwindow.c:604 +#: ../moo/mooedit/mooeditwindow.c:603 msgid "Next Bookmark" msgstr "" -#: ../moo/mooedit/mooeditwindow.c:605 +#: ../moo/mooedit/mooeditwindow.c:604 msgid "_Next Bookmark" msgstr "" -#: ../moo/mooedit/mooeditwindow.c:612 +#: ../moo/mooedit/mooeditwindow.c:611 msgid "Previous Bookmark" msgstr "" -#: ../moo/mooedit/mooeditwindow.c:613 +#: ../moo/mooedit/mooeditwindow.c:612 msgid "_Previous Bookmark" msgstr "" #. action -#: ../moo/mooedit/mooeditwindow.c:621 ../moo/mooedit/mooeditwindow.c:622 -#: ../moo/mooedit/mooeditwindow.c:623 +#: ../moo/mooedit/mooeditwindow.c:620 ../moo/mooedit/mooeditwindow.c:621 +#: ../moo/mooedit/mooeditwindow.c:622 msgid "Comment" msgstr "" #. action -#: ../moo/mooedit/mooeditwindow.c:631 ../moo/mooedit/mooeditwindow.c:632 -#: ../moo/mooedit/mooeditwindow.c:633 +#: ../moo/mooedit/mooeditwindow.c:630 ../moo/mooedit/mooeditwindow.c:631 +#: ../moo/mooedit/mooeditwindow.c:632 msgid "Uncomment" msgstr "" #. Insensitive menu item which appears in Window menu with no documents open -#: ../moo/mooedit/mooeditwindow.c:661 +#: ../moo/mooedit/mooeditwindow.c:660 msgid "No Documents" msgstr "" -#: ../moo/mooedit/mooeditwindow.c:669 +#: ../moo/mooedit/mooeditwindow.c:668 msgid "Page Setup" msgstr "" -#: ../moo/mooedit/mooeditwindow.c:670 +#: ../moo/mooedit/mooeditwindow.c:669 msgid "Page S_etup..." msgstr "" -#: ../moo/mooedit/mooeditwindow.c:671 +#: ../moo/mooedit/mooeditwindow.c:670 msgid "Page Setup..." msgstr "" -#: ../moo/mooedit/mooeditwindow.c:696 ../moo/mooedit/mooeditwindow.c:1739 +#: ../moo/mooedit/mooeditwindow.c:695 ../moo/mooedit/mooeditwindow.c:1738 msgid "Export as PDF" msgstr "" -#: ../moo/mooedit/mooeditwindow.c:697 +#: ../moo/mooedit/mooeditwindow.c:696 msgid "E_xport as PDF..." msgstr "" -#: ../moo/mooedit/mooeditwindow.c:698 +#: ../moo/mooedit/mooeditwindow.c:697 msgid "Export as PDF..." msgstr "" #. Translators: this goes into window title, %s stands for filename, e.g. "/foo/bar.txt [new file]" -#: ../moo/mooedit/mooeditwindow.c:917 +#: ../moo/mooedit/mooeditwindow.c:916 #, c-format msgid "%s [new file]" msgstr "" #. Translators: this goes into window title, %s stands for filename, e.g. "/foo/bar.txt [modified on disk]" -#: ../moo/mooedit/mooeditwindow.c:920 +#: ../moo/mooedit/mooeditwindow.c:919 #, c-format msgid "%s [modified on disk]" msgstr "" #. Translators: this goes into window title, %s stands for filename, e.g. "/foo/bar.txt [deleted]" -#: ../moo/mooedit/mooeditwindow.c:923 +#: ../moo/mooedit/mooeditwindow.c:922 #, c-format msgid "%s [deleted]" msgstr "" #. Translators: this goes into window title, %s stands for filename, e.g. "/foo/bar.txt [new file] [modified]" -#: ../moo/mooedit/mooeditwindow.c:931 +#: ../moo/mooedit/mooeditwindow.c:930 #, c-format msgid "%s [new file] [modified]" msgstr "" #. Translators: this goes into window title, %s stands for filename, e.g. "/foo/bar.txt [modified on disk] [modified]" -#: ../moo/mooedit/mooeditwindow.c:934 +#: ../moo/mooedit/mooeditwindow.c:933 #, c-format msgid "%s [modified on disk] [modified]" msgstr "" #. Translators: this goes into window title, %s stands for filename, e.g. "/foo/bar.txt [deleted] [modified]" -#: ../moo/mooedit/mooeditwindow.c:937 +#: ../moo/mooedit/mooeditwindow.c:936 #, c-format msgid "%s [deleted] [modified]" msgstr "" #. Translators: this goes into window title, %s stands for filename, e.g. "/foo/bar.txt [modified]" -#: ../moo/mooedit/mooeditwindow.c:940 +#: ../moo/mooedit/mooeditwindow.c:939 #, c-format msgid "%s [modified]" msgstr "" -#: ../moo/mooedit/mooeditwindow.c:1178 +#: ../moo/mooedit/mooeditwindow.c:1177 msgid "Reopen Using Encoding" msgstr "" -#: ../moo/mooedit/mooeditwindow.c:1228 +#: ../moo/mooedit/mooeditwindow.c:1227 msgid "_Encoding" msgstr "" -#: ../moo/mooedit/mooeditwindow.c:1283 +#: ../moo/mooedit/mooeditwindow.c:1282 msgid "Line En_dings" msgstr "" -#: ../moo/mooedit/mooeditwindow.c:1290 +#: ../moo/mooedit/mooeditwindow.c:1289 msgid "_Windows (CR+LF)" msgstr "" -#: ../moo/mooedit/mooeditwindow.c:1299 +#: ../moo/mooedit/mooeditwindow.c:1298 msgid "_Unix (LF)" msgstr "" -#: ../moo/mooedit/mooeditwindow.c:1303 +#: ../moo/mooedit/mooeditwindow.c:1302 msgid "_Mac (CR)" msgstr "" -#: ../moo/mooedit/mooeditwindow.c:1307 +#: ../moo/mooedit/mooeditwindow.c:1306 msgid "Mi_xed" msgstr "" -#: ../moo/mooedit/mooeditwindow.c:2936 +#: ../moo/mooedit/mooeditwindow.c:2935 #, c-format msgid "Line: %s Col: %s" msgstr "" -#: ../moo/mooedit/mooeditwindow.c:2937 +#: ../moo/mooedit/mooeditwindow.c:2936 #, c-format msgid "Chars: %s" msgstr "" #. Label in the editor window statusbar - Overwrite or Insert mode -#: ../moo/mooedit/mooeditwindow.c:2978 +#: ../moo/mooedit/mooeditwindow.c:2977 msgid "OVR" msgstr "" -#: ../moo/mooedit/mooeditwindow.c:2978 +#: ../moo/mooedit/mooeditwindow.c:2977 msgid "INS" msgstr "" -#: ../moo/mooedit/mooeditwindow.c:3075 +#: ../moo/mooedit/mooeditwindow.c:3074 msgid "_Language" msgstr "" #. Menu item in the Language menu -#: ../moo/mooedit/mooeditwindow.c:3080 +#: ../moo/mooedit/mooeditwindow.c:3079 msgid "Language|None" msgstr "" -#: ../moo/mooedit/mooplugin.c:1416 +#: ../moo/mooedit/mooplugin.c:1411 msgid "Plugins" msgstr "" @@ -1301,21 +1301,16 @@ msgstr "" msgid "Configure Shortcuts" msgstr "" -#: ../moo/mooutils/moocompat.c:382 -#, c-format -msgid "Existing file '%s' could not be removed: g_unlink() failed: %s" -msgstr "" - -#: ../moo/mooutils/moodialogs.c:348 +#: ../moo/mooutils/moodialogs.c:347 #, c-format msgid "Save changes to document \"%s\" before closing?" msgstr "" -#: ../moo/mooutils/moodialogs.c:349 +#: ../moo/mooutils/moodialogs.c:348 msgid "Save changes to the document before closing?" msgstr "" -#: ../moo/mooutils/moodialogs.c:354 +#: ../moo/mooutils/moodialogs.c:353 msgid "If you don't save, changes will be discarded" msgstr "" @@ -1577,31 +1572,31 @@ msgstr "" msgid "Keep on top" msgstr "" -#: ../moo/mooutils/moostock.c:41 +#: ../moo/mooutils/moostock.c:40 msgid "Save _None" msgstr "" -#: ../moo/mooutils/moostock.c:42 +#: ../moo/mooutils/moostock.c:41 msgid "Save _Selected" msgstr "" -#: ../moo/mooutils/moostock.c:44 +#: ../moo/mooutils/moostock.c:43 msgid "Move" msgstr "" -#: ../moo/mooutils/moostock.c:45 +#: ../moo/mooutils/moostock.c:44 msgid "Link" msgstr "" -#: ../moo/mooutils/moostock.c:47 ../moo/plugins/moofileselector.c:1100 +#: ../moo/mooutils/moostock.c:46 ../moo/plugins/moofileselector.c:1100 msgid "Save Copy" msgstr "" -#: ../moo/mooutils/moostock.c:48 +#: ../moo/mooutils/moostock.c:47 msgid "_New Folder" msgstr "" -#: ../moo/mooutils/moostock.c:49 +#: ../moo/mooutils/moostock.c:48 msgid "New _Window" msgstr "" @@ -1610,87 +1605,87 @@ msgstr "" msgid "Could not open %s: %s" msgstr "" -#: ../moo/mooutils/mooutils-file.c:266 ../moo/mooutils/mooutils-fs.c:388 -#: ../moo/mooutils/mooutils-fs.c:407 ../moo/mooutils/mooutils-fs.c:423 +#: ../moo/mooutils/mooutils-file.c:266 ../moo/mooutils/mooutils-fs.c:387 +#: ../moo/mooutils/mooutils-fs.c:406 ../moo/mooutils/mooutils-fs.c:422 #, c-format msgid "Could not create folder %s: %s" msgstr "" #. This is error message in file selector when rm #. fails for some strange reason -#: ../moo/mooutils/mooutils-fs.c:228 +#: ../moo/mooutils/mooutils-fs.c:227 #, c-format msgid "Could not run 'rm' command: %s" msgstr "" #. This is error message in file selector when rm #. fails to delete a file or folder -#: ../moo/mooutils/mooutils-fs.c:246 +#: ../moo/mooutils/mooutils-fs.c:245 #, c-format msgid "'rm' command failed: %s" msgstr "" -#: ../moo/mooutils/mooutils-fs.c:296 ../moo/mooutils/mooutils-fs.c:316 -#: ../moo/mooutils/mooutils-fs.c:343 +#: ../moo/mooutils/mooutils-fs.c:295 ../moo/mooutils/mooutils-fs.c:315 +#: ../moo/mooutils/mooutils-fs.c:342 #, c-format msgid "Could not remove %s: %s" msgstr "" -#: ../moo/mooutils/mooutils-fs.c:452 +#: ../moo/mooutils/mooutils-fs.c:451 #, c-format msgid "Could not rename file %s to %s: %s" msgstr "" -#: ../moo/mooutils/mooutils-misc.c:1839 +#: ../moo/mooutils/mooutils-misc.c:1847 #, c-format msgid "" "console message|in file %s, line %d, function %s:\n" "%s" msgstr "" -#: ../moo/mooutils/mooutils-misc.c:1936 +#: ../moo/mooutils/mooutils-misc.c:1944 #, c-format msgid "console message|in file %s, line %d, function %s: %s" msgstr "" -#: ../moo/mooutils/moowindow.c:235 +#: ../moo/mooutils/moowindow.c:234 msgid "Configure _Shortcuts..." msgstr "" -#: ../moo/mooutils/moowindow.c:243 ../moo/mooutils/moowindow.c:244 +#: ../moo/mooutils/moowindow.c:242 ../moo/mooutils/moowindow.c:243 msgid "Show Toolbar" msgstr "" -#: ../moo/mooutils/moowindow.c:250 ../moo/mooutils/moowindow.c:251 +#: ../moo/mooutils/moowindow.c:249 ../moo/mooutils/moowindow.c:250 msgid "Show Menubar" msgstr "" -#: ../moo/mooutils/moowindow.c:258 ../moo/mooutils/moowindow.c:259 +#: ../moo/mooutils/moowindow.c:257 ../moo/mooutils/moowindow.c:258 msgid "Show Statusbar" msgstr "" -#: ../moo/mooutils/moowindow.c:461 +#: ../moo/mooutils/moowindow.c:460 #, c-format msgid "Could not parse geometry string '%s'\n" msgstr "" -#: ../moo/mooutils/moowindow.c:1172 +#: ../moo/mooutils/moowindow.c:1171 msgid "_Icons Only" msgstr "" -#: ../moo/mooutils/moowindow.c:1173 +#: ../moo/mooutils/moowindow.c:1172 msgid "_Labels Only" msgstr "" -#: ../moo/mooutils/moowindow.c:1174 +#: ../moo/mooutils/moowindow.c:1173 msgid "Labels _Below Icons" msgstr "" -#: ../moo/mooutils/moowindow.c:1175 +#: ../moo/mooutils/moowindow.c:1174 msgid "Labels Be_side Icons" msgstr "" -#: ../moo/mooutils/moowindow.c:1185 +#: ../moo/mooutils/moowindow.c:1184 msgid "Toolbar _Style" msgstr "" @@ -1765,12 +1760,12 @@ msgstr "" msgid "Fi_les:" msgstr "" -#: ../moo/plugins/moofilelist.c:2349 ../moo/plugins/moofilelist.c:2350 -#: ../moo/plugins/moofilelist.c:2407 +#: ../moo/plugins/moofilelist.c:2348 ../moo/plugins/moofilelist.c:2349 +#: ../moo/plugins/moofilelist.c:2406 msgid "File List" msgstr "" -#: ../moo/plugins/moofilelist.c:2407 +#: ../moo/plugins/moofilelist.c:2406 msgid "List of files" msgstr "" @@ -1892,11 +1887,11 @@ msgstr "" msgid "Lua support" msgstr "" -#: ../moo/plugins/moopython.c:111 +#: ../moo/plugins/moopythonplugin.c:58 msgid "Python" msgstr "" -#: ../moo/plugins/moopython.c:111 +#: ../moo/plugins/moopythonplugin.c:58 msgid "Python support" msgstr ""