nyje
/
medit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renamed preferences files: they are now prefs.xml, state.xml, session.xml

master
Yevgen Muntyan 2010-11-06 23:57:00 -07:00
parent ae5a76fc14
commit 914f31e57e
4 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
configure.ac
View File

@ -36,9 +36,10 @@ AC_SUBST(MOO_COPYRIGHT,"_moo_copyright_")
# keep in sync with po/maintain
AC_SUBST(MOO_PACKAGE_NAME,"medit-1")
MOO_INI_FILE_NAME="medit.ini"
MOO_STATE_FILE_NAME="medit.state"
MOO_SESSION_FILE_NAME="medit.session"
MOO_PREFS_XML_FILE_NAME="prefs.xml"
MOO_STATE_XML_FILE_NAME="state.xml"
MOO_SESSION_XML_FILE_NAME="session.xml"
AC_SUBST(GETTEXT_PACKAGE,$MOO_PACKAGE_NAME)
AC_SUBST(GETTEXT_PACKAGE_GSV,"$MOO_PACKAGE_NAME-gsv")

6
m4/moo-flags.m4
View File

@ -161,9 +161,9 @@ AC_DEFUN_ONCE([MOO_AC_SET_DIRS],[
AC_SUBST(MOO_TEXT_LANG_FILES_DIR, "${MOO_DATA_DIR}/language-specs")
AC_DEFINE_UNQUOTED([MOO_INI_FILE_NAME], "$MOO_INI_FILE_NAME", [medit.ini])
AC_DEFINE_UNQUOTED([MOO_STATE_FILE_NAME], "$MOO_STATE_FILE_NAME", [medit.state])
AC_DEFINE_UNQUOTED([MOO_SESSION_FILE_NAME], "$MOO_SESSION_FILE_NAME", [medit.session])
AC_DEFINE_UNQUOTED([MOO_PREFS_XML_FILE_NAME], "$MOO_PREFS_XML_FILE_NAME", [prefs.xml])
AC_DEFINE_UNQUOTED([MOO_STATE_XML_FILE_NAME], "$MOO_STATE_XML_FILE_NAME", [state.xml])
AC_DEFINE_UNQUOTED([MOO_SESSION_XML_FILE_NAME], "$MOO_SESSION_XML_FILE_NAME", [session.xml])
])
##############################################################################

10
moo/mooapp/mooapp.c
View File

@ -1145,10 +1145,10 @@ moo_app_load_session (MooApp *app)
if (!app->priv->session_file)
{
if (app->priv->instance_name)
app->priv->session_file = g_strdup_printf (MOO_SESSION_FILE_NAME ".%s",
app->priv->session_file = g_strdup_printf (MOO_SESSION_XML_FILE_NAME ".%s",
app->priv->instance_name);
else
app->priv->session_file = g_strdup (MOO_SESSION_FILE_NAME);
app->priv->session_file = g_strdup (MOO_SESSION_XML_FILE_NAME);
}
session_file = moo_get_user_cache_file (app->priv->session_file);
@ -1428,10 +1428,10 @@ moo_app_load_prefs (MooApp *app)
GError *error = NULL;
char **sys_files;
app->priv->rc_files[MOO_PREFS_RC] = moo_get_user_data_file (MOO_INI_FILE_NAME);
app->priv->rc_files[MOO_PREFS_STATE] = moo_get_user_cache_file (MOO_STATE_FILE_NAME);
app->priv->rc_files[MOO_PREFS_RC] = moo_get_user_data_file (MOO_PREFS_XML_FILE_NAME);
app->priv->rc_files[MOO_PREFS_STATE] = moo_get_user_cache_file (MOO_STATE_XML_FILE_NAME);
sys_files = moo_get_sys_data_files (MOO_INI_FILE_NAME);
sys_files = moo_get_sys_data_files (MOO_PREFS_XML_FILE_NAME);
if (!moo_prefs_load (sys_files,
app->priv->rc_files[MOO_PREFS_RC],

2
moo/mooutils/moomarkup.c
View File

@ -1212,7 +1212,7 @@ moo_markup_write_pretty (MooMarkupDoc *doc,
g_return_val_if_fail (MOO_MARKUP_IS_DOC (doc), FALSE);
g_return_val_if_fail (writer != NULL, FALSE);
result = moo_file_writer_write (writer, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n", -1);
result = moo_file_writer_write (writer, "<?xml version=\"1.0\" encoding=\"UTF-8\"?><!-- -*- xml -*- -->\n", -1);
for (child = doc->children; result && child != NULL; child = child->next)
if (MOO_MARKUP_IS_ELEMENT (child))