commit 8bde9802a292b258be1e5a8182e1dbe849ef38ac
parent 40db67ee07eb440f911958aa6b24185648d2462c
Author: Colin Leroy <colin@colino.net>
Date: Tue, 9 Feb 2010 08:03:46 +0000
2010-02-09 [colin] 3.7.5cvs12
* src/mimeview.c
And fix 2.10 build :)
Diffstat:
4 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-09 [colin] 3.7.5cvs12
+
+ * src/mimeview.c
+ And fix 2.10 build :)
+
2010-02-09 [colin] 3.7.5cvs11
* configure.ac
diff --git a/PATCHSETS b/PATCHSETS
@@ -3952,3 +3952,4 @@
( cvs diff -u -r 1.83.2.158 -r 1.83.2.159 src/mimeview.c; cvs diff -u -r 1.5.2.28 -r 1.5.2.29 src/gtk/description_window.c; ) > 3.7.5cvs9.patchset
( cvs diff -u -r 1.382.2.542 -r 1.382.2.543 src/compose.c; ) > 3.7.5cvs10.patchset
( cvs diff -u -r 1.654.2.4023 -r 1.654.2.4024 configure.ac; cvs diff -u -r 1.155.2.95 -r 1.155.2.96 src/Makefile.am; cvs diff -u -r 1.382.2.543 -r 1.382.2.544 src/compose.c; cvs diff -u -r 1.23.2.33 -r 1.23.2.34 src/crash.c; cvs diff -u -r 1.26.2.44 -r 1.26.2.45 src/foldersel.c; cvs diff -u -r -1.1.2.15 -r -1.1.2.16 src/gedit-print.c; cvs diff -u -r -1.1.2.6 -r -1.1.2.7 src/gedit-print.h; cvs diff -u -r 1.115.2.223 -r 1.115.2.224 src/main.c; cvs diff -u -r 1.274.2.304 -r 1.274.2.305 src/mainwindow.c; cvs diff -u -r 1.94.2.208 -r 1.94.2.209 src/messageview.c; cvs diff -u -r 1.19.2.24 -r 1.19.2.25 src/messageview.h; cvs diff -u -r 1.60.2.70 -r 1.60.2.71 src/prefs_actions.c; cvs diff -u -r 1.204.2.193 -r 1.204.2.194 src/prefs_common.c; cvs diff -u -r 1.103.2.126 -r 1.103.2.127 src/prefs_common.h; cvs diff -u -r 1.3.2.24 -r 1.3.2.25 src/prefs_ext_prog.c; cvs diff -u -r 1.1.4.62 -r 1.1.4.63 src/prefs_filtering_action.c; cvs diff -u -r 1.4.2.25 -r 1.4.2.26 src/prefs_fonts.c; cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/prefs_image_viewer.c; cvs diff -u -r 1.43.2.82 -r 1.43.2.83 src/prefs_matcher.c; cvs diff -u -r 1.1.2.40 -r 1.1.2.41 src/prefs_msg_colors.c; cvs diff -u -r 1.1.2.63 -r 1.1.2.64 src/prefs_summaries.c; cvs diff -u -r 1.12.2.71 -r 1.12.2.72 src/prefs_template.c; cvs diff -u -r 1.1.2.28 -r 1.1.2.29 src/printing.c; cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/printing.h; cvs diff -u -r 1.8.2.40 -r 1.8.2.41 src/quote_fmt.c; cvs diff -u -r 1.395.2.416 -r 1.395.2.417 src/summaryview.c; cvs diff -u -r 1.96.2.220 -r 1.96.2.221 src/textview.c; cvs diff -u -r 1.20.2.23 -r 1.20.2.24 src/gtk/Makefile.am; cvs diff -u -r 1.4.2.76 -r 1.4.2.77 src/gtk/about.c; cvs diff -u -r 1.1.2.10 -r 1.1.2.11 src/gtk/gtkcmclist.c; cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/gtk/gtkcmctree.c; cvs diff -u -r -1.1.2.13 -r -1.1.2.14 src/gtk/gtksourceprintjob.c; cvs diff -u -r -1.1.2.5 -r -1.1.2.6 src/gtk/gtksourceprintjob.h; cvs diff -u -r 1.5.2.88 -r 1.5.2.89 src/gtk/gtkutils.c; cvs diff -u -r 1.1.2.88 -r 1.1.2.89 src/gtk/quicksearch.c; ) > 3.7.5cvs11.patchset
+( cvs diff -u -r 1.83.2.159 -r 1.83.2.160 src/mimeview.c; ) > 3.7.5cvs12.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
MICRO_VERSION=5
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=11
+EXTRA_VERSION=12
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
diff --git a/src/mimeview.c b/src/mimeview.c
@@ -2332,9 +2332,15 @@ static void icon_list_append_icon (MimeView *mimeview, MimeInfo *mimeinfo)
content_type = procmime_get_content_type_str(mimeinfo->type,
mimeinfo->subtype);
+#if GTK_CHECK_VERSION(2,12,0)
tip = g_strconcat("<b>", _("Type:"), " </b>", content_type,
"\n<b>", _("Size:"), " </b>",
to_human_readable((goffset)mimeinfo->length), NULL);
+#else
+ tip = g_strconcat(_("Type:"), " ", content_type,
+ "\n", _("Size:"), " ",
+ to_human_readable((goffset)mimeinfo->length), NULL);
+#endif
g_free(content_type);
if (desc && *desc) {
gchar *tmp = NULL;
@@ -2343,10 +2349,17 @@ static void icon_list_append_icon (MimeView *mimeview, MimeInfo *mimeinfo)
} else {
tmp = g_strdup(desc);
}
+#if GTK_CHECK_VERSION(2,12,0)
tiptmp = g_strconcat(tip, "\n<b>",
prefs_common.attach_desc && mimeinfo->description ?
_("Description") : _("Filename:"),
" </b>", tmp, NULL);
+#else
+ tiptmp = g_strconcat(tip, "\n",
+ prefs_common.attach_desc && mimeinfo->description ?
+ _("Description") : _("Filename:"),
+ " ", tmp, NULL);
+#endif
g_free(tip);
tip = tiptmp;
g_free(tmp);
@@ -2358,7 +2371,11 @@ static void icon_list_append_icon (MimeView *mimeview, MimeInfo *mimeinfo)
}
g_free(sigshort);
+#if GTK_CHECK_VERSION(2,12,0)
gtk_widget_set_tooltip_markup(button, tip);
+#else
+ CLAWS_SET_TIP(button, tip);
+#endif
g_free(tip);
gtk_widget_show_all(button);
gtk_drag_source_set(button, GDK_BUTTON1_MASK|GDK_BUTTON3_MASK,
