From: Paul Mangan Date: Fri, 12 Nov 2004 09:21:06 +0000 (+0000) Subject: 2004-11-12 [paul] 0.9.12cvs146.4 X-Git-Tag: gtk2_win32_last_merge~94 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=19fbdf65cc0a49e269b54935737ac602e6226042 2004-11-12 [paul] 0.9.12cvs146.4 * src/exporthtml.c * src/exportldif.c * src/imap.c * src/mh.c * src/mimeview.c * src/prefs_spelling.c * src/prefs_themes.c replace deprecated g_dirname --- diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws index 4e5720e50..58fae2f86 100644 --- a/ChangeLog-gtk2.claws +++ b/ChangeLog-gtk2.claws @@ -1,3 +1,14 @@ +2004-11-12 [paul] 0.9.12cvs146.4 + + * src/exporthtml.c + * src/exportldif.c + * src/imap.c + * src/mh.c + * src/mimeview.c + * src/prefs_spelling.c + * src/prefs_themes.c + replace deprecated g_dirname + 2004-11-12 [colin] 0.9.12cvs146.3 * src/textview.c diff --git a/PATCHSETS b/PATCHSETS index 04202d522..2b5ccece6 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -228,3 +228,4 @@ ( cvs diff -u -r 1.396.2.11 -r 1.396.2.12 ChangeLog; cvs diff -u -r 1.2504.2.31 -r 1.2504.2.32 ChangeLog.claws; cvs diff -u -r 1.391.2.11 -r 1.391.2.12 ChangeLog.jp; cvs diff -u -r 1.42.2.3 -r 1.42.2.4 NEWS; cvs diff -u -r 1.654.2.259 -r 1.654.2.260 configure.ac; cvs diff -u -r 1.61.2.14 -r 1.61.2.15 src/account.c; cvs diff -u -r 1.207.2.20 -r 1.207.2.21 src/folderview.c; cvs diff -u -r 1.20.2.2 -r 1.20.2.3 src/folderview.h; cvs diff -u -r 1.179.2.10 -r 1.179.2.11 src/imap.c; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/imap_gtk.c; cvs diff -u -r 1.149.2.16 -r 1.149.2.17 src/inc.c; cvs diff -u -r 1.274.2.22 -r 1.274.2.23 src/mainwindow.c; cvs diff -u -r 1.2.2.2 -r 1.2.2.3 src/mh_gtk.c; cvs diff -u -r 1.2.2.2 -r 1.2.2.3 src/news_gtk.c; cvs diff -u -r 1.56.2.27 -r 1.56.2.28 src/pop.c; cvs diff -u -r 1.105.2.11 -r 1.105.2.12 src/prefs_account.c; cvs diff -u -r 1.49.2.6 -r 1.49.2.7 src/prefs_account.h; cvs diff -u -r 1.3.2.3 -r 1.3.2.4 src/prefs_ext_prog.c; cvs diff -u -r 1.49.2.18 -r 1.49.2.19 src/procmime.c; cvs diff -u -r 1.17.2.6 -r 1.17.2.7 src/procmime.h; cvs diff -u -r 1.150.2.11 -r 1.150.2.12 src/procmsg.c; cvs diff -u -r 1.60.2.8 -r 1.60.2.9 src/procmsg.h; cvs diff -u -r 1.15.2.10 -r 1.15.2.11 src/summary_search.c; cvs diff -u -r 1.395.2.38 -r 1.395.2.39 src/summaryview.c; cvs diff -u -r 1.96.2.31 -r 1.96.2.32 src/textview.c; cvs diff -u -r 1.9.2.7 -r 1.9.2.8 src/common/defs.h; cvs diff -u -r 1.36.2.13 -r 1.36.2.14 src/common/utils.c; cvs diff -u -r 1.20.2.9 -r 1.20.2.10 src/common/utils.h; cvs diff -u -r 1.5.2.12 -r 1.5.2.13 src/gtk/menu.c; cvs diff -u -r 1.4.2.5 -r 1.4.2.6 src/gtk/menu.h; ) > 0.9.12cvs146.1.patchset ( cvs diff -u -r 1.65.2.17 -r 1.65.2.18 src/codeconv.c; ) > 0.9.12cvs146.2.patchset ( cvs diff -u -r 1.96.2.32 -r 1.96.2.33 src/textview.c; ) > 0.9.12cvs146.3.patchset +( cvs diff -u -r 1.5.2.2 -r 1.5.2.3 src/exporthtml.c; cvs diff -u -r 1.1.4.2 -r 1.1.4.3 src/exportldif.c; cvs diff -u -r 1.179.2.11 -r 1.179.2.12 src/imap.c; cvs diff -u -r 1.79.2.4 -r 1.79.2.5 src/mh.c; cvs diff -u -r 1.83.2.23 -r 1.83.2.24 src/mimeview.c; cvs diff -u -r 1.5.2.4 -r 1.5.2.5 src/prefs_spelling.c; cvs diff -u -r 1.3.2.8 -r 1.3.2.9 src/prefs_themes.c; ) > 0.9.12cvs146.4.patchset diff --git a/configure.ac b/configure.ac index d56d0492a..da6ba6dc0 100644 --- a/configure.ac +++ b/configure.ac @@ -13,7 +13,7 @@ INTERFACE_AGE=0 BINARY_AGE=0 EXTRA_VERSION=146 EXTRA_RELEASE= -EXTRA_GTK2_VERSION=.3 +EXTRA_GTK2_VERSION=.4 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION} diff --git a/src/exporthtml.c b/src/exporthtml.c index 937230c9e..69b195594 100644 --- a/src/exporthtml.c +++ b/src/exporthtml.c @@ -1054,7 +1054,7 @@ void exporthtml_parse_filespec( ExportHtmlCtl *ctl, gchar *fileSpec ) { ctl->fileHtml = mgu_replace_string( ctl->fileHtml, g_basename( fileSpec ) ); - t = g_dirname( fileSpec ); + t = g_path_get_dirname( fileSpec ); ctl->dirOutput = mgu_replace_string( ctl->dirOutput, t ); g_free( t ); ctl->path = mgu_replace_string( ctl->path, fileSpec ); diff --git a/src/exportldif.c b/src/exportldif.c index 5cbe524d8..932944028 100644 --- a/src/exportldif.c +++ b/src/exportldif.c @@ -537,7 +537,7 @@ void exportldif_parse_filespec( ExportLdifCtl *ctl, gchar *fileSpec ) { ctl->fileLdif = mgu_replace_string( ctl->fileLdif, g_basename( fileSpec ) ); - t = g_dirname( fileSpec ); + t = g_path_get_dirname( fileSpec ); ctl->dirOutput = mgu_replace_string( ctl->dirOutput, t ); g_free( t ); ctl->path = mgu_replace_string( ctl->path, fileSpec ); diff --git a/src/imap.c b/src/imap.c index 937ade996..43d022f7b 100644 --- a/src/imap.c +++ b/src/imap.c @@ -1738,7 +1738,7 @@ static gint imap_rename_folder(Folder *folder, FolderItem *item, separator = imap_get_path_separator(IMAP_FOLDER(folder), item->path); if (strchr(item->path, G_DIR_SEPARATOR)) { - dirpath = g_dirname(item->path); + dirpath = g_path_get_dirname(item->path); newpath = g_strconcat(dirpath, G_DIR_SEPARATOR_S, name, NULL); g_free(dirpath); } else diff --git a/src/mh.c b/src/mh.c index 556aa3743..2f3d82917 100644 --- a/src/mh.c +++ b/src/mh.c @@ -639,7 +639,7 @@ static gint mh_rename_folder(Folder *folder, FolderItem *item, if (!is_dir_exist(oldpath)) make_dir_hier(oldpath); - dirname = g_dirname(oldpath); + dirname = g_path_get_dirname(oldpath); real_name = mh_filename_from_utf8(name); newpath = g_strconcat(dirname, G_DIR_SEPARATOR_S, real_name, NULL); g_free(real_name); @@ -655,7 +655,7 @@ static gint mh_rename_folder(Folder *folder, FolderItem *item, g_free(newpath); if (strchr(item->path, G_DIR_SEPARATOR) != NULL) { - dirname = g_dirname(item->path); + dirname = g_path_get_dirname(item->path); utf8newpath = g_strconcat(dirname, G_DIR_SEPARATOR_S, name, NULL); g_free(dirname); diff --git a/src/mimeview.c b/src/mimeview.c index 92422f022..2632f0530 100644 --- a/src/mimeview.c +++ b/src/mimeview.c @@ -1012,7 +1012,7 @@ static gboolean mimeview_write_part(const gchar *filename, { gchar *dir; - dir= g_dirname(filename); + dir= g_path_get_dirname(filename); if (!is_dir_exist(dir)) make_dir_hier(dir); g_free(dir); @@ -1147,7 +1147,7 @@ static void mimeview_save_as(MimeView *mimeview) mimeview_write_part(filename, partinfo); - filedir = g_dirname(filename); + filedir = g_path_get_dirname(filename); if (filedir && strcmp(filedir, ".")) { if (prefs_common.attach_save_dir) g_free(prefs_common.attach_save_dir); diff --git a/src/prefs_spelling.c b/src/prefs_spelling.c index 13e01c042..ea3c0e8d6 100644 --- a/src/prefs_spelling.c +++ b/src/prefs_spelling.c @@ -97,7 +97,7 @@ static void prefs_spelling_btn_aspell_path_clicked_cb(GtkWidget *widget, if (file_path != NULL) { gchar *tmp_path, *tmp; - tmp_path = g_dirname(file_path); + tmp_path = g_path_get_dirname(file_path); tmp = g_strdup_printf("%s%s", tmp_path, G_DIR_SEPARATOR_S); g_free(tmp_path); diff --git a/src/prefs_themes.c b/src/prefs_themes.c index 40f2e7c05..de6204ce4 100644 --- a/src/prefs_themes.c +++ b/src/prefs_themes.c @@ -464,7 +464,7 @@ static void prefs_themes_btn_install_clicked_cb(GtkWidget *widget, gpointer data return; cinfo = g_new0(CopyInfo, 1); - source = g_dirname(filename); + source = g_path_get_dirname(filename); themename = g_basename(source); debug_print("Installing '%s' theme from %s\n", themename, filename);