/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2011 Hiroyuki Yamamoto and the Claws Mail team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include <glib.h>
#include <glib/gi18n.h>
#include <gdk/gdkkeysyms.h>
-#include <gtk/gtknotebook.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkctree.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkvpaned.h>
-#include <gtk/gtktext.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkdnd.h>
-#include <gtk/gtkselection.h>
-#include <gtk/gtktooltips.h>
-#include <gtk/gtkcontainer.h>
-#include <gtk/gtkbutton.h>
+#include <gtk/gtk.h>
#include <stdio.h>
#include <sys/types.h>
#include <sys/stat.h>
#include "timing.h"
#ifdef MAEMO
-//#include <hildon-widgets/hildon-program.h>
-//#include <gtk/gtkmain.h>
#include <libosso.h>
+#ifndef CHINOOK
#include <osso-mime.h>
+#else
+#include <hildon-mime.h>
+#endif
#endif
typedef enum
static void mimeview_set_multipart_tree (MimeView *mimeview,
MimeInfo *mimeinfo,
- GtkCTreeNode *parent);
-static GtkCTreeNode *mimeview_append_part (MimeView *mimeview,
+ GtkCMCTreeNode *parent);
+static GtkCMCTreeNode *mimeview_append_part (MimeView *mimeview,
MimeInfo *partinfo,
- GtkCTreeNode *parent);
+ GtkCMCTreeNode *parent);
static void mimeview_show_message_part (MimeView *mimeview,
MimeInfo *partinfo);
static void mimeview_change_view_type (MimeView *mimeview,
static gboolean mimeview_write_part (const gchar *filename,
MimeInfo *partinfo);
-static void mimeview_selected (GtkCTree *ctree,
- GtkCTreeNode *node,
+static void mimeview_selected (GtkCMCTree *ctree,
+ GtkCMCTreeNode *node,
gint column,
MimeView *mimeview);
static void mimeview_start_drag (GtkWidget *widget,
static void mimeview_save_all (MimeView *mimeview);
static void mimeview_launch (MimeView *mimeview,
MimeInfo *partinfo);
+#ifndef G_OS_WIN32
static void mimeview_open_with (MimeView *mimeview);
static void mimeview_open_part_with (MimeView *mimeview,
MimeInfo *partinfo,
gboolean automatic);
+#endif
static void mimeview_select_next_part (MimeView *mimeview);
static void mimeview_select_prev_part (MimeView *mimeview);
static void mimeview_view_file (const gchar *filename,
MimeView *mimeview);
static MimeInfo *mimeview_get_part_to_use(MimeView *mimeview);
-static void mimeview_launch_cb(MimeView *mimeview)
+static void mimeview_launch_cb(GtkAction *action, gpointer data)
{
+ MimeView *mimeview = (MimeView *)data;
mimeview_launch(mimeview, mimeview_get_part_to_use(mimeview));
}
-static GtkItemFactoryEntry mimeview_popup_entries[] =
+
+#ifndef G_OS_WIN32
+static void mimeview_open_with_cb(GtkAction *action, gpointer data)
{
- {N_("/_Open (l)"), NULL, mimeview_launch_cb, 0, NULL},
-#ifndef MAEMO
- {N_("/Open _with (o)..."), NULL, mimeview_open_with, 0, NULL},
+ mimeview_open_with((MimeView *)data);
+}
#endif
- {N_("/_Display as text (t)"), NULL, mimeview_display_as_text, 0, NULL},
- {N_("/_Save as (y)..."), NULL, mimeview_save_as, 0, NULL},
- {N_("/Save _all..."), NULL, mimeview_save_all, 0, NULL},
- {N_("/Next part (a)"), NULL, mimeview_select_next_part,0, NULL},
+
+static void mimeview_display_as_text_cb(GtkAction *action, gpointer data)
+{
+ mimeview_display_as_text((MimeView *)data);
+}
+
+static void mimeview_save_as_cb(GtkAction *action, gpointer data)
+{
+ mimeview_save_as((MimeView *)data);
+}
+
+static void mimeview_save_all_cb(GtkAction *action, gpointer data)
+{
+ mimeview_save_all((MimeView *)data);
+}
+
+static void mimeview_select_next_part_cb(GtkAction *action, gpointer data)
+{
+ mimeview_select_next_part((MimeView *)data);
+}
+
+static GtkActionEntry mimeview_menu_actions[] = {
+ { "MimeView", NULL, "MimeView" },
+ { "MimeView/Open", NULL, N_("_Open (l)"), NULL, "Open MIME part", G_CALLBACK(mimeview_launch_cb) },
+#if (!defined MAEMO && !defined G_OS_WIN32)
+ { "MimeView/OpenWith", NULL, N_("Open _with (o)..."), NULL, "Open MIME part with...", G_CALLBACK(mimeview_open_with_cb) },
+#endif
+ { "MimeView/DisplayAsText", NULL, N_("_Display as text (t)"), NULL, "Display as text", G_CALLBACK(mimeview_display_as_text_cb) },
+ { "MimeView/SaveAs", NULL, N_("_Save as (y)..."), NULL, "Save as", G_CALLBACK(mimeview_save_as_cb) },
+ { "MimeView/SaveAll", NULL, N_("Save _all..."), NULL, "Save all parts", G_CALLBACK(mimeview_save_all_cb) },
+ { "MimeView/NextPart", NULL, N_("Next part (a)"), NULL, "Next part", G_CALLBACK(mimeview_select_next_part_cb) }
};
static GtkTargetEntry mimeview_mime_types[] =
GtkWidget *arrow;
GtkWidget *scrollbutton;
GtkWidget *hbox;
- GtkTooltips *tooltips;
- GtkItemFactory *popupfactory;
NoticeView *siginfoview;
+ GtkRequisition r;
+
gchar *titles[N_MIMEVIEW_COLS];
- gint n_entries;
gint i;
+ CLAWS_TIP_DECL();
if (!hand_cursor)
hand_cursor = gdk_cursor_new(GDK_HAND2);
GTK_POLICY_AUTOMATIC);
ctree = gtk_sctree_new_with_titles(N_MIMEVIEW_COLS, 0, titles);
- gtk_widget_show(ctree);
- gtk_clist_set_selection_mode(GTK_CLIST(ctree), GTK_SELECTION_BROWSE);
- gtk_ctree_set_line_style(GTK_CTREE(ctree), GTK_CTREE_LINES_NONE);
- gtk_clist_set_column_justification(GTK_CLIST(ctree), COL_SIZE,
+
+ if (prefs_common.show_col_headers == FALSE)
+ gtk_cmclist_column_titles_hide(GTK_CMCLIST(ctree));
+
+ gtk_cmclist_set_selection_mode(GTK_CMCLIST(ctree), GTK_SELECTION_BROWSE);
+ gtk_cmctree_set_line_style(GTK_CMCTREE(ctree), GTK_CMCTREE_LINES_NONE);
+ gtk_cmclist_set_column_justification(GTK_CMCLIST(ctree), COL_SIZE,
GTK_JUSTIFY_RIGHT);
- gtk_clist_set_column_width(GTK_CLIST(ctree), COL_MIMETYPE, 240);
- gtk_clist_set_column_width(GTK_CLIST(ctree), COL_SIZE, 90);
+ gtk_cmclist_set_column_width(GTK_CMCLIST(ctree), COL_MIMETYPE, 240);
+ gtk_cmclist_set_column_width(GTK_CMCLIST(ctree), COL_SIZE, 90);
+ gtk_cmclist_set_column_auto_resize(GTK_CMCLIST(ctree), COL_MIMETYPE, TRUE);
+ gtk_cmclist_set_column_auto_resize(GTK_CMCLIST(ctree), COL_NAME, TRUE);
for (i = 0; i < N_MIMEVIEW_COLS; i++)
- GTK_WIDGET_UNSET_FLAGS(GTK_CLIST(ctree)->column[i].button,
- GTK_CAN_FOCUS);
+ gtkut_widget_set_can_focus(GTK_CMCLIST(ctree)->column[i].button,
+ FALSE);
+ gtk_widget_show(ctree);
gtk_container_add(GTK_CONTAINER(scrolledwin), ctree);
g_signal_connect(G_OBJECT(ctree), "tree_select_row",
mime_notebook = gtk_notebook_new();
gtk_widget_show(mime_notebook);
- GTK_WIDGET_UNSET_FLAGS(mime_notebook, GTK_CAN_FOCUS);
+ gtkut_widget_set_can_focus(mime_notebook, FALSE);
gtk_notebook_set_show_tabs(GTK_NOTEBOOK(mime_notebook), FALSE);
gtk_notebook_set_show_border(GTK_NOTEBOOK(mime_notebook), FALSE);
mime_toggle = gtk_event_box_new();
gtk_event_box_set_visible_window(GTK_EVENT_BOX(mime_toggle), FALSE);
- g_signal_connect(G_OBJECT(mime_toggle), "visibility-notify-event",
- G_CALLBACK(mimeview_visi_notify), mimeview);
g_signal_connect(G_OBJECT(mime_toggle), "motion-notify-event",
G_CALLBACK(mimeview_visi_notify), mimeview);
g_signal_connect(G_OBJECT(mime_toggle), "leave-notify-event",
mimeview->ctree_mode = FALSE;
arrow = gtk_arrow_new(GTK_ARROW_LEFT, GTK_SHADOW_NONE);
gtk_widget_show(arrow);
+ gtk_widget_size_request(arrow, &r);
gtk_container_add(GTK_CONTAINER(mime_toggle), arrow);
g_signal_connect(G_OBJECT(mime_toggle), "button_release_event",
G_CALLBACK(mime_toggle_button_cb), mimeview);
ctree_mainbox = gtk_hbox_new(FALSE, 0);
gtk_box_pack_start(GTK_BOX(ctree_mainbox), scrolledwin, TRUE, TRUE, 0);
- n_entries = sizeof(mimeview_popup_entries) /
- sizeof(mimeview_popup_entries[0]);
- popupmenu = menu_create_items(mimeview_popup_entries, n_entries,
- "<MimeView>", &popupfactory, mimeview);
- tooltips = gtk_tooltips_new();
+ mimeview->ui_manager = gtk_ui_manager_new();
+ mimeview->action_group = cm_menu_create_action_group_full(mimeview->ui_manager,
+ "MimeView", mimeview_menu_actions,
+ G_N_ELEMENTS(mimeview_menu_actions), (gpointer)mimeview);
+
+ MENUITEM_ADDUI_MANAGER(mimeview->ui_manager, "/", "Menus", "Menus", GTK_UI_MANAGER_MENUBAR)
+ MENUITEM_ADDUI_MANAGER(mimeview->ui_manager,
+ "/Menus/", "MimeView", "MimeView", GTK_UI_MANAGER_MENU);
+ MENUITEM_ADDUI_MANAGER(mimeview->ui_manager,
+ "/Menus/MimeView/", "Open", "MimeView/Open",
+ GTK_UI_MANAGER_MENUITEM);
+#if (!defined MAEMO && !defined G_OS_WIN32)
+ MENUITEM_ADDUI_MANAGER(mimeview->ui_manager,
+ "/Menus/MimeView/", "OpenWith", "MimeView/OpenWith",
+ GTK_UI_MANAGER_MENUITEM);
+#endif
+ MENUITEM_ADDUI_MANAGER(mimeview->ui_manager,
+ "/Menus/MimeView/", "DisplayAsText", "MimeView/DisplayAsText",
+ GTK_UI_MANAGER_MENUITEM);
+ MENUITEM_ADDUI_MANAGER(mimeview->ui_manager,
+ "/Menus/MimeView/", "SaveAs", "MimeView/SaveAs",
+ GTK_UI_MANAGER_MENUITEM);
+ MENUITEM_ADDUI_MANAGER(mimeview->ui_manager,
+ "/Menus/MimeView/", "SaveAll", "MimeView/SaveAll",
+ GTK_UI_MANAGER_MENUITEM);
+ MENUITEM_ADDUI_MANAGER(mimeview->ui_manager,
+ "/Menus/MimeView/", "NextPart", "MimeView/NextPart",
+ GTK_UI_MANAGER_MENUITEM);
+
+ popupmenu = gtk_menu_item_get_submenu(GTK_MENU_ITEM(
+ gtk_ui_manager_get_widget(mimeview->ui_manager, "/Menus/MimeView")) );
+
vbox = gtk_vbox_new(FALSE, 0);
gtk_widget_show(vbox);
paned = gtk_vpaned_new();
gtk_widget_show(paned);
- gtk_paned_set_gutter_size(GTK_PANED(paned), 0);
gtk_paned_pack1(GTK_PANED(paned), ctree_mainbox, FALSE, TRUE);
gtk_paned_pack2(GTK_PANED(paned), vbox, TRUE, TRUE);
gtk_widget_show(hbox);
gtk_widget_hide(ctree_mainbox);
-#ifdef MAEMO
- gtk_widget_set_size_request(mime_toggle, -1, arrow->requisition.height + 8);
+#ifdef GENERIC_UMPC
+ gtk_widget_set_size_request(mime_toggle, -1, r.height + 8);
#endif
mimeview->hbox = hbox;
mimeview->paned = paned;
mimeview->ctree = ctree;
mimeview->mime_notebook = mime_notebook;
mimeview->popupmenu = popupmenu;
- mimeview->popupfactory = popupfactory;
mimeview->type = -1;
mimeview->ctree_mainbox = ctree_mainbox;
mimeview->icon_scroll = icon_scroll;
mimeview->icon_mainbox = icon_mainbox;
mimeview->icon_count = 0;
mimeview->mainwin = mainwin;
- mimeview->tooltips = tooltips;
+#if !(GTK_CHECK_VERSION(2,12,0))
+ mimeview->tooltips = tips;
+#endif
mimeview->oldsize = 60;
mimeview->mime_toggle = mime_toggle;
mimeview->siginfoview = siginfoview;
void mimeview_show_message(MimeView *mimeview, MimeInfo *mimeinfo,
const gchar *file)
{
- GtkCTree *ctree = GTK_CTREE(mimeview->ctree);
- GtkCTreeNode *node;
+ GtkCMCTree *ctree = GTK_CMCTREE(mimeview->ctree);
+ GtkCMCTreeNode *node;
mimeview_clear(mimeview);
- g_return_if_fail(file != NULL);
- g_return_if_fail(mimeinfo != NULL);
+ cm_return_if_fail(file != NULL);
+ cm_return_if_fail(mimeinfo != NULL);
mimeview->mimeinfo = mimeinfo;
g_signal_handlers_unblock_by_func(G_OBJECT(ctree),
mimeview_selected, mimeview);
- node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
+ node = GTK_CMCTREE_NODE(GTK_CMCLIST(ctree)->row_list);
if (node) {
- gtk_ctree_select(ctree, node);
+ gtk_cmctree_select(ctree, node);
icon_list_toggle_by_mime_info
- (mimeview, gtk_ctree_node_get_row_data(ctree, node));
+ (mimeview, gtk_cmctree_node_get_row_data(ctree, node));
gtkut_ctree_set_focus_row(ctree, node);
}
}
g_slist_free(mimeview->viewers);
gtk_target_list_unref(mimeview->target_list);
- mimeview_free_mimeinfo(mimeview);
#ifdef USE_PTHREAD
if (mimeview->check_data) {
mimeview->check_data->destroy_mimeview = TRUE;
} else
#endif
{
+ mimeview_free_mimeinfo(mimeview);
g_free(mimeview->file);
g_free(mimeview);
mimeviews = g_slist_remove(mimeviews, mimeview);
MimeInfo *mimeview_get_selected_part(MimeView *mimeview)
{
- return gtk_ctree_node_get_row_data
- (GTK_CTREE(mimeview->ctree), mimeview->opened);
+ return gtk_cmctree_node_get_row_data
+ (GTK_CMCTREE(mimeview->ctree), mimeview->opened);
}
gint mimeview_get_selected_part_num(MimeView *mimeview)
{
gint i = 0;
- GList *rows = GTK_CLIST(mimeview->ctree)->row_list;
+ GList *rows = GTK_CMCLIST(mimeview->ctree)->row_list;
while (rows) {
- if (mimeview->opened == GTK_CTREE_NODE(rows))
+ if (mimeview->opened == GTK_CMCTREE_NODE(rows))
return i;
i++;
rows = rows->next;
{
if (i < 0)
return;
- gtk_clist_unselect_all(GTK_CLIST(mimeview->ctree));
- gtk_clist_select_row(GTK_CLIST(mimeview->ctree), i, -1);
- gtkut_clist_set_focus_row(GTK_CLIST(mimeview->ctree), i);
+ gtk_cmclist_unselect_all(GTK_CMCLIST(mimeview->ctree));
+ gtk_cmclist_select_row(GTK_CMCLIST(mimeview->ctree), i, -1);
+ gtkut_clist_set_focus_row(GTK_CMCLIST(mimeview->ctree), i);
}
static void mimeview_set_multipart_tree(MimeView *mimeview,
MimeInfo *mimeinfo,
- GtkCTreeNode *parent)
+ GtkCMCTreeNode *parent)
{
- GtkCTreeNode *node;
+ GtkCMCTreeNode *node;
- g_return_if_fail(mimeinfo != NULL);
+ cm_return_if_fail(mimeinfo != NULL);
while (mimeinfo != NULL) {
node = mimeview_append_part(mimeview, mimeinfo, parent);
return get_part_name(partinfo);
}
-static GtkCTreeNode *mimeview_append_part(MimeView *mimeview,
+static GtkCMCTreeNode *mimeview_append_part(MimeView *mimeview,
MimeInfo *partinfo,
- GtkCTreeNode *parent)
+ GtkCMCTreeNode *parent)
{
- GtkCTree *ctree = GTK_CTREE(mimeview->ctree);
- GtkCTreeNode *node;
+ GtkCMCTree *ctree = GTK_CMCTREE(mimeview->ctree);
+ GtkCMCTreeNode *node;
static gchar content_type[64];
gchar *str[N_MIMEVIEW_COLS];
}
str[COL_MIMETYPE] = content_type;
- str[COL_SIZE] = to_human_readable(partinfo->length);
+ str[COL_SIZE] = to_human_readable((goffset)partinfo->length);
if (prefs_common.attach_desc)
str[COL_NAME] = (gchar *) get_part_description(partinfo);
else
str[COL_NAME] = (gchar *) get_part_name(partinfo);
node = gtk_sctree_insert_node(ctree, parent, NULL, str, 0,
- NULL, NULL, NULL, NULL,
+ NULL, NULL,
FALSE, TRUE);
- gtk_ctree_node_set_row_data(ctree, node, partinfo);
+ gtk_cmctree_node_set_row_data(ctree, node, partinfo);
return node;
}
GSList *cur;
MimeViewerFactory *factory = NULL;
MimeViewer *viewer = NULL;
+ gchar *real_contenttype = NULL;
/*
* FNM_CASEFOLD is a GNU extension
- * if its not defined copy the string to the stack and
- * convert the copy to lower case
*/
#ifndef FNM_CASEFOLD
#define FNM_CASEFOLD 0
- Xstrdup_a(content_type, content_type, return NULL);
- g_strdown((gchar *)content_type);
+ real_contenttype = g_utf8_strdown((gchar *)content_type, -1);
+#else
+ real_contenttype = g_strdup(content_type);
#endif
for (cur = mimeviewer_factories; cur != NULL; cur = g_slist_next(cur)) {
gint i = 0;
while (curfactory->content_types[i] != NULL) {
- if(!fnmatch(curfactory->content_types[i], content_type, FNM_CASEFOLD)) {
+ if(!fnmatch(curfactory->content_types[i], real_contenttype, FNM_CASEFOLD)) {
debug_print("%s\n", curfactory->content_types[i]);
factory = curfactory;
break;
if (factory != NULL)
break;
}
+ g_free(real_contenttype);
if (factory == NULL)
return NULL;
return viewer;
}
+gboolean mimeview_has_viewer_for_content_type(MimeView *mimeview, const gchar *content_type)
+{
+ return (get_viewer_for_content_type(mimeview, content_type) != NULL);
+}
+
static MimeViewer *get_viewer_for_mimeinfo(MimeView *mimeview, MimeInfo *partinfo)
{
gchar *content_type = NULL;
{
MimeViewer *viewer;
+ if (mimeview->messageview->partial_display_shown) {
+ noticeview_hide(mimeview->messageview->noticeview);
+ mimeview->messageview->partial_display_shown = FALSE;
+ }
+
viewer = get_viewer_for_mimeinfo(mimeview, partinfo);
if (viewer == NULL) {
if (mimeview->mimeviewer != NULL)
void mimeview_clear(MimeView *mimeview)
{
- GtkCList *clist = NULL;
+ GtkCMCList *clist = NULL;
if (!mimeview)
return;
if (g_slist_find(mimeviews, mimeview) == NULL)
return;
- clist = GTK_CLIST(mimeview->ctree);
+ clist = GTK_CMCLIST(mimeview->ctree);
noticeview_hide(mimeview->siginfoview);
- gtk_clist_clear(clist);
+ gtk_cmclist_clear(clist);
textview_clear(mimeview->textview);
if (mimeview->mimeviewer != NULL)
mimeview->mimeviewer->clear_viewer(mimeview->mimeviewer);
}
static void check_signature_cb(GtkWidget *widget, gpointer user_data);
-void mimeview_check_signature(MimeView *mimeview);
+static void mimeview_check_signature(MimeView *mimeview);
static void display_full_info_cb(GtkWidget *widget, gpointer user_data);
static void update_signature_noticeview(MimeView *mimeview, MimeInfo *mimeinfo,
StockPixmap icon = STOCK_PIXMAP_PRIVACY_SIGNED;
SignatureStatus mycode = SIGNATURE_UNCHECKED;
- g_return_if_fail(mimeview != NULL);
- g_return_if_fail(mimeinfo != NULL);
+ cm_return_if_fail(mimeview != NULL);
+ cm_return_if_fail(mimeinfo != NULL);
if (special)
mycode = code;
func = display_full_info_cb;
icon = STOCK_PIXMAP_PRIVACY_WARN;
break;
+ case SIGNATURE_KEY_EXPIRED:
+ button_text = _("View full information");
+ func = display_full_info_cb;
+ icon = STOCK_PIXMAP_PRIVACY_EXPIRED;
+ break;
case SIGNATURE_INVALID:
button_text = _("View full information");
func = display_full_info_cb;
/* reset all thread stuff, and do the cleanups we've been left to do */
static void mimeview_check_data_reset(MimeView *mimeview)
{
+ gboolean must_free;
+ gboolean must_destroy;
+
if (!mimeview->check_data)
return;
- if (mimeview->check_data->free_after_use) {
+ must_free = mimeview->check_data->free_after_use;
+ must_destroy = mimeview->check_data->destroy_mimeview;
+
+ if (mimeview->check_data->cancel_th_init) {
+ debug_print("killing canceller thread\n");
+ mimeview->check_data->cancel_th_init = FALSE;
+ pthread_cancel(mimeview->check_data->cancel_th);
+ }
+
+ g_free(mimeview->check_data);
+ mimeview->check_data = NULL;
+
+ if (must_free) {
debug_print("freeing deferred mimeinfo\n");
procmime_mimeinfo_free_all(mimeview->check_data->siginfo);
}
- if (mimeview->check_data->destroy_mimeview) {
+ if (must_destroy) {
debug_print("freeing deferred mimeview\n");
+ mimeview_free_mimeinfo(mimeview);
g_free(mimeview->file);
g_free(mimeview);
mimeviews = g_slist_remove(mimeviews, mimeview);
}
- g_free(mimeview->check_data);
- mimeview->check_data = NULL;
}
/* GUI update once the checker thread is done or killed */
if (!mimeview->check_data)
return NULL;
- if (mimeinfo && mimeinfo == mimeview->check_data->siginfo)
+ if (mimeinfo && mimeinfo == mimeview->check_data->siginfo) {
privacy_mimeinfo_check_signature(mimeinfo);
- else {
+ if (mimeview->check_data && mimeview->check_data->cancel_th_init) {
+ mimeview->check_data->cancel_th_init = FALSE;
+ pthread_cancel(mimeview->check_data->cancel_th);
+ }
+ } else {
/* that's strange! we changed message without
* getting killed. */
g_warning("different siginfo!\n");
/* wait for a few seconds... */
debug_print("waiting a while\n");
- sleep(5);
+ g_usleep(5 * 1000 * 1000);
if (!mimeview->check_data)
return NULL; /* nothing to kill, it's done in time :) */
/* too late, go away checker thread */
debug_print("killing checker thread\n");
- pthread_cancel(mimeview->check_data->th);
-
+ if (mimeview->check_data->th_init) {
+ mimeview->check_data->th_init = FALSE;
+ pthread_cancel(mimeview->check_data->th);
+ }
+
/* tell upstream it was a timeout */
mimeview->check_data->timeout = TRUE;
/* use g_timeout so that GUI updates is done from the
if (!mimeview->check_data)
return;
debug_print("killing checker thread NOW\n");
- pthread_cancel(mimeview->check_data->th);
+ if (mimeview->check_data->th_init) {
+ mimeview->check_data->th_init = FALSE;
+ pthread_cancel(mimeview->check_data->th);
+ }
/* tell upstream it was a timeout */
mimeview->check_data->timeout = TRUE;
mimeview->check_data->siginfo = mimeview->siginfo;
debug_print("creating thread\n");
- pthread_attr_init(&detach);
- pthread_attr_setdetachstate(&detach, TRUE);
-
- pthread_attr_init(&detach2);
- pthread_attr_setdetachstate(&detach2, TRUE);
-
- /* create the checker thread */
- if (pthread_create(&th, &detach,
+ /* init thread attributes and create the checker thread */
+ if (pthread_attr_init(&detach) != 0 ||
+ pthread_attr_setdetachstate(&detach, PTHREAD_CREATE_DETACHED) != 0 ||
+ pthread_attr_init(&detach2) != 0 ||
+ pthread_attr_setdetachstate(&detach2, PTHREAD_CREATE_DETACHED) != 0 ||
+ pthread_create(&th, &detach,
mimeview_check_sig_worker_thread,
mimeview) != 0) {
/* arh. We'll do it synchronously. */
g_free(mimeview->check_data);
mimeview->check_data = NULL;
return;
- } else
+ } else {
mimeview->check_data->th = th;
+ mimeview->check_data->th_init = TRUE;
+ }
/* create the killer thread */
pthread_create(&th2, &detach2,
mimeview_check_sig_cancel_thread,
mimeview);
+
+ mimeview->check_data->cancel_th = th2;
+ mimeview->check_data->cancel_th_init = TRUE;
}
#endif
#endif
noticeview_set_text(mimeview->siginfoview, _("Checking signature..."));
GTK_EVENTS_FLUSH();
-#if (defined USE_PTHREAD && ((defined __GLIBC__ && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3))) || !defined __GLIBC__))
+#ifdef USE_PTHREAD
/* let's do it non-blocking */
mimeview_check_sig_in_thread(mimeview);
if (!mimeview->check_data) /* let's check syncronously */
}
}
-void mimeview_check_signature(MimeView *mimeview)
+static void mimeview_check_signature(MimeView *mimeview)
{
check_signature_cb(NULL, mimeview);
}
static void redisplay_email(GtkWidget *widget, gpointer user_data)
{
MimeView *mimeview = (MimeView *) user_data;
- GtkCTreeNode *node = mimeview->opened;
+ GtkCMCTreeNode *node = mimeview->opened;
mimeview->opened = NULL;
- mimeview_selected(GTK_CTREE(mimeview->ctree), node, 0, mimeview);
+ mimeview_selected(GTK_CMCTREE(mimeview->ctree), node, 0, mimeview);
}
static void display_full_info_cb(GtkWidget *widget, gpointer user_data)
MimeInfo *siginfo;
MimeInfo *first_text;
- g_return_if_fail(mimeview != NULL);
- g_return_if_fail(selected != NULL);
+ cm_return_if_fail(mimeview != NULL);
+ cm_return_if_fail(selected != NULL);
if (selected->type == MIMETYPE_MESSAGE
&& !g_ascii_strcasecmp(selected->subtype, "rfc822")) {
noticeview_show(mimeview->siginfoview);
}
-static void mimeview_selected(GtkCTree *ctree, GtkCTreeNode *node, gint column,
+static void mimeview_selected(GtkCMCTree *ctree, GtkCMCTreeNode *node, gint column,
MimeView *mimeview)
{
MimeInfo *partinfo;
if (mimeview->opened == node) return;
mimeview->opened = node;
mimeview->spec_part = NULL;
- gtk_ctree_node_moveto(ctree, node, -1, 0.5, 0);
+ gtk_cmctree_node_moveto(ctree, node, -1, 0.5, 0);
- partinfo = gtk_ctree_node_get_row_data(ctree, node);
+ partinfo = gtk_cmctree_node_get_row_data(ctree, node);
if (!partinfo) return;
/* ungrab the mouse event */
- if (GTK_WIDGET_HAS_GRAB(ctree)) {
+ if (gtkut_widget_has_grab(GTK_WIDGET(ctree))) {
gtk_grab_remove(GTK_WIDGET(ctree));
if (gdk_pointer_is_grabbed())
gdk_pointer_ungrab(GDK_CURRENT_TIME);
GdkDragContext *context;
MimeInfo *partinfo;
- g_return_if_fail(mimeview != NULL);
+ cm_return_if_fail(mimeview != NULL);
partinfo = mimeview_get_selected_part(mimeview);
if (partinfo->disposition == DISPOSITIONTYPE_INLINE) return;
static gint mimeview_button_pressed(GtkWidget *widget, GdkEventButton *event,
MimeView *mimeview)
{
- GtkCList *clist = GTK_CLIST(widget);
+ GtkCMCList *clist = GTK_CMCLIST(widget);
gint row, column;
if (!event) return FALSE;
if (event->button == 2 || event->button == 3) {
- if (!gtk_clist_get_selection_info(clist, event->x, event->y,
+ if (!gtk_cmclist_get_selection_info(clist, event->x, event->y,
&row, &column))
return FALSE;
- gtk_clist_unselect_all(clist);
- gtk_clist_select_row(clist, row, column);
+ gtk_cmclist_unselect_all(clist);
+ gtk_cmclist_select_row(clist, row, column);
gtkut_clist_set_focus_row(clist, row);
}
part_button_pressed(mimeview, event, mimeview_get_selected_part(mimeview));
if (partinfo && (partinfo->type == MIMETYPE_MESSAGE ||
partinfo->type == MIMETYPE_IMAGE ||
partinfo->type == MIMETYPE_MULTIPART))
- menu_set_sensitive(mimeview->popupfactory,
- "/Display as text (t)", FALSE);
+ cm_menu_set_sensitive_full(mimeview->ui_manager, "Menus/MimeView/DisplayAsText", FALSE);
else
- menu_set_sensitive(mimeview->popupfactory,
- "/Display as text (t)", TRUE);
+ cm_menu_set_sensitive_full(mimeview->ui_manager, "Menus/MimeView/DisplayAsText", TRUE);
+#ifndef G_OS_WIN32
if (partinfo &&
partinfo->type == MIMETYPE_APPLICATION &&
!g_ascii_strcasecmp(partinfo->subtype, "octet-stream"))
- menu_set_sensitive(mimeview->popupfactory,
- "/Open (l)", FALSE);
+ cm_menu_set_sensitive_full(mimeview->ui_manager, "Menus/MimeView/Open", FALSE);
else
- menu_set_sensitive(mimeview->popupfactory,
- "/Open (l)", TRUE);
+#endif
+ cm_menu_set_sensitive_full(mimeview->ui_manager, "Menus/MimeView/Open", TRUE);
g_object_set_data(G_OBJECT(mimeview->popupmenu),
"pop_partinfo", partinfo);
static void mimeview_select_next_part(MimeView *mimeview)
{
- GtkCTree *ctree = GTK_CTREE(mimeview->ctree);
- GtkCTreeNode *node = mimeview->opened;
+ GtkCMCTree *ctree = GTK_CMCTREE(mimeview->ctree);
+ GtkCMCTreeNode *node = mimeview->opened;
MimeInfo *partinfo = NULL;
skip:
- node = GTK_CTREE_NODE_NEXT(node);
+ node = GTK_CMCTREE_NODE_NEXT(node);
if (!node)
- node = gtk_ctree_node_nth(GTK_CTREE(ctree), 0);
+ node = gtk_cmctree_node_nth(GTK_CMCTREE(ctree), 0);
if (node) {
- partinfo = gtk_ctree_node_get_row_data(ctree, node);
- if (partinfo->type == MIMETYPE_MULTIPART)
+ partinfo = gtk_cmctree_node_get_row_data(ctree, node);
+ if (partinfo->type == MIMETYPE_MULTIPART ||
+ (!prefs_common.show_inline_attachments && partinfo->id))
goto skip;
gtk_sctree_unselect_all(GTK_SCTREE(ctree));
gtk_sctree_select(GTK_SCTREE(ctree), node);
static void mimeview_select_prev_part(MimeView *mimeview)
{
- GtkCTree *ctree = GTK_CTREE(mimeview->ctree);
- GtkCTreeNode *node = mimeview->opened;
+ GtkCMCTree *ctree = GTK_CMCTREE(mimeview->ctree);
+ GtkCMCTreeNode *node = mimeview->opened;
MimeInfo *partinfo = NULL;
skip:
- node = GTK_CTREE_NODE_PREV(node);
+ node = GTK_CMCTREE_NODE_PREV(node);
if (!node)
- node = gtk_ctree_node_nth(GTK_CTREE(ctree), GTK_CLIST(ctree)->rows - 1);
+ node = gtk_cmctree_node_nth(GTK_CMCTREE(ctree), GTK_CMCLIST(ctree)->rows - 1);
if (node) {
- partinfo = gtk_ctree_node_get_row_data(ctree, node);
+ partinfo = gtk_cmctree_node_get_row_data(ctree, node);
if (partinfo->type == MIMETYPE_MULTIPART)
goto skip;
gtk_sctree_unselect_all(GTK_SCTREE(ctree));
MimeView *mimeview)
{
SummaryView *summaryview;
- GtkCTree *ctree = GTK_CTREE(widget);
+ GtkCMCTree *ctree = GTK_CMCTREE(widget);
if (!event) return FALSE;
if (!mimeview->opened) return FALSE;
return FALSE;
switch (event->keyval) {
+ case GDK_Page_Down:
case GDK_space:
- if (mimeview_scroll_page(mimeview, FALSE))
+ if (mimeview_scroll_page(mimeview,
+ (event->state & GDK_SHIFT_MASK) != 0))
return TRUE;
-
- mimeview_select_next_part(mimeview);
+
+ if (!(event->state & GDK_SHIFT_MASK))
+ mimeview_select_next_part(mimeview);
return TRUE;
-
+ case GDK_Page_Up:
case GDK_BackSpace:
mimeview_scroll_page(mimeview, TRUE);
return TRUE;
mimeview_scroll_one_line(mimeview,
(event->state & GDK_MOD1_MASK) != 0);
return TRUE;
+ case GDK_Up:
+ case GDK_Down:
+ mimeview_scroll_one_line(mimeview, (event->keyval == GDK_Up));
+ return TRUE;
case GDK_n:
case GDK_N:
BREAK_ON_MODIFIER_KEY();
case GDK_o:
BREAK_ON_MODIFIER_KEY();
KEY_PRESS_EVENT_STOP();
+#ifndef G_OS_WIN32
mimeview_open_with(mimeview);
+#endif
return TRUE;
case GDK_c:
BREAK_ON_MODIFIER_KEY();
gchar *filename = NULL, *uriname, *tmp;
MimeInfo *partinfo;
gint err;
+ gint count = 0;
if (!mimeview->opened) return;
if (!mimeview->file) return;
filename = g_strconcat(get_mime_tmp_dir(), G_DIR_SEPARATOR_S,
tmp, NULL);
+check_new_file:
+ if (is_file_exist(filename)) {
+ gchar *ext = NULL;
+ gchar *prefix = NULL;
+ gchar *new_name = NULL;
+ if (strrchr(tmp, '.')) {
+ prefix = g_strdup(tmp);
+ ext = g_strdup(strrchr(tmp, '.'));
+ *(strrchr(prefix, '.')) = '\0';
+ } else {
+ prefix = g_strdup(tmp);
+ ext = g_strdup("");
+ }
+ count++;
+ new_name = g_strdup_printf("%s.%d%s", prefix, count, ext);
+ g_free(prefix);
+ g_free(ext);
+ g_free(filename);
+ filename = g_strconcat(get_mime_tmp_dir(), G_DIR_SEPARATOR_S,
+ new_name, NULL);
+ g_free(new_name);
+ goto check_new_file;
+ }
+
g_free(tmp);
if ((err = procmime_get_part(filename, partinfo)) < 0)
(_("Couldn't save the part of multipart message: %s"),
strerror(-err));
- uriname = g_strconcat("file://", filename, "\r\n", NULL);
+ tmp = g_filename_to_uri(filename, NULL, NULL);
+ uriname = g_strconcat(tmp, "\r\n", NULL);
+ g_free(tmp);
gtk_selection_data_set(selection_data, selection_data->target, 8,
(guchar *)uriname, strlen(uriname));
gchar *filename;
filename = g_strdup(get_part_name(partinfo));
- if (!filename || !*filename)
+ if (!filename || !*filename) {
+ g_free(filename);
filename = g_strdup_printf("noname.%d", number);
+ }
if (!g_utf8_validate(filename, -1, NULL)) {
gchar *tmp = conv_filename_to_utf8(filename);
subst_for_filename(filename);
fullname = g_strconcat
- (basedir, G_DIR_SEPARATOR_S, (filename[0] == G_DIR_SEPARATOR)
+ (basedir, G_DIR_SEPARATOR_S, (g_path_is_absolute(filename))
? &filename[1] : filename, NULL);
g_free(filename);
alertpanel_error(_("'%s' is not a directory."),
dirname);
g_free(startdir);
+ g_free(dirname);
return;
}
g_free(startdir);
prefs_common.attach_save_dir = g_filename_to_utf8(dirname,
-1, NULL, NULL, NULL);
+ g_free(dirname);
}
static MimeInfo *mimeview_get_part_to_use(MimeView *mimeview)
partinfo = mimeview_get_part_to_use(mimeview);
- g_return_if_fail(partinfo != NULL);
+ cm_return_if_fail(partinfo != NULL);
if (get_part_name(partinfo) == NULL) {
return;
subst_for_filename(partname);
- if (prefs_common.attach_save_dir)
+ if (prefs_common.attach_save_dir && *prefs_common.attach_save_dir)
filepath = g_strconcat(prefs_common.attach_save_dir,
G_DIR_SEPARATOR_S, partname, NULL);
else
partinfo = mimeview_get_part_to_use(mimeview);
mimeview_select_mimepart_icon(mimeview, partinfo);
- g_return_if_fail(partinfo != NULL);
+ cm_return_if_fail(partinfo != NULL);
mimeview_show_message_part(mimeview, partinfo);
}
if (!partinfo)
partinfo = mimeview_get_part_to_use(mimeview);
- g_return_if_fail(partinfo != NULL);
+ cm_return_if_fail(partinfo != NULL);
filename = procmime_get_tmp_file_name(partinfo);
g_free(filename);
}
+#ifndef G_OS_WIN32
static void mimeview_open_with(MimeView *mimeview)
{
MimeInfo *partinfo;
gchar *uri;
int r = 0;
#endif
- g_return_if_fail(partinfo != NULL);
+ cm_return_if_fail(partinfo != NULL);
filename = procmime_get_tmp_file_name(partinfo);
#ifdef MAEMO
if (content_type != NULL) {
- uri = g_strconcat ("file://", filename, NULL);
+ uri = g_filename_to_uri(filename, NULL, NULL);
dbusconn = osso_get_dbus_connection (get_osso_context());
+#ifdef CHINOOK
+ r = hildon_mime_open_file_with_mime_type (dbusconn, uri, content_type);
+#else
r = osso_mime_open_file_with_mime_type (dbusconn, uri, content_type);
+#endif
g_free(uri);
}
if (r != 1) {
#endif
if ((partinfo->type == MIMETYPE_TEXT && !strcmp(partinfo->subtype, "html"))
- && prefs_common.uri_cmd && prefs_common.uri_cmd[0]) {
- mime_command = g_strdup(prefs_common.uri_cmd);
+ && prefs_common_get_uri_cmd() && prefs_common.uri_cmd[0]) {
+ mime_command = g_strdup(prefs_common_get_uri_cmd());
g_free(content_type);
content_type = NULL;
- } else if (partinfo->type != MIMETYPE_TEXT || !prefs_common.ext_editor_cmd
- || !prefs_common.ext_editor_cmd[0]) {
+ } else if (partinfo->type != MIMETYPE_TEXT || !prefs_common_get_ext_editor_cmd()
+ || !prefs_common_get_ext_editor_cmd()[0]) {
mime_command = mailcap_get_command_for_type(content_type, filename);
} else {
- mime_command = g_strdup(prefs_common.ext_editor_cmd);
+ mime_command = g_strdup(prefs_common_get_ext_editor_cmd());
g_free(content_type);
content_type = NULL;
}
if (content_type != NULL)
cmd = input_dialog_combo_remember
(_("Open with"),
- _("Enter the command line to open file:\n"
+ _("Enter the command-line to open file:\n"
"('%s' will be replaced with file name)"),
mime_command ? mime_command : prefs_common.mime_open_cmd,
- prefs_common.mime_open_cmd_history,
- TRUE, &remember);
+ prefs_common.mime_open_cmd_history, &remember);
else
cmd = input_dialog_combo
(_("Open with"),
- _("Enter the command line to open file:\n"
+ _("Enter the command-line to open file:\n"
"('%s' will be replaced with file name)"),
mime_command ? mime_command : prefs_common.mime_open_cmd,
- prefs_common.mime_open_cmd_history,
- TRUE);
+ prefs_common.mime_open_cmd_history);
if (cmd && remember) {
mailcap_update_default(content_type, cmd);
}
g_free(content_type);
g_free(filename);
}
+#endif
static void mimeview_view_file(const gchar *filename, MimeInfo *partinfo,
const gchar *cmd, MimeView *mimeview)
{
+#ifndef G_OS_WIN32
gchar *p;
gchar buf[BUFFSIZE];
if (cmd == NULL)
if ((p = strchr(cmd, '%')) && *(p + 1) == 's' &&
!strchr(p + 2, '%')) {
g_snprintf(buf, sizeof(buf), cmd, filename);
- g_chmod(filename, S_IRUSR);
+ if (!prefs_common.save_parts_readwrite)
+ g_chmod(filename, S_IRUSR);
+ else
+ g_chmod(filename, S_IRUSR|S_IWUSR);
} else {
- g_warning("MIME viewer command line is invalid: '%s'", cmd);
+ g_warning("MIME viewer command-line is invalid: '%s'", cmd);
mimeview_open_part_with(mimeview, partinfo, FALSE);
}
if (execute_command_line(buf, TRUE) != 0) {
- g_chmod(filename, S_IRUSR|S_IWUSR);
+ if (!prefs_common.save_parts_readwrite)
+ g_chmod(filename, S_IRUSR|S_IWUSR);
mimeview_open_part_with(mimeview, partinfo, FALSE);
}
}
+#else
+ SHFILEINFO file_info;
+ if ((SHGetFileInfo(filename, 0, &file_info, sizeof(SHFILEINFO), SHGFI_EXETYPE)) != 0) {
+ AlertValue val = alertpanel_full(_("Execute untrusted binary?"),
+ _("This attachment is an executable file. Executing "
+ "untrusted binaries is dangerous and could probably "
+ "lead to compromission of your computer.\n\n"
+ "Do you want to run this file?"), GTK_STOCK_CANCEL,
+ _("Run binary"),
+ NULL, FALSE, NULL, ALERT_WARNING, G_ALERTDEFAULT);
+ if (val == G_ALERTALTERNATE) {
+ debug_print("executing binary\n");
+ ShellExecute(NULL, "open", filename, NULL, NULL, SW_SHOW);
+ }
+ } else
+ ShellExecute(NULL, "open", filename, NULL, NULL, SW_SHOW);
+
+#endif
}
void mimeview_register_viewer_factory(MimeViewerFactory *factory)
static void icon_selected (MimeView *mimeview, gint num, MimeInfo *partinfo)
{
- GtkCTreeNode *node;
- node = gtk_ctree_find_by_row_data(GTK_CTREE(mimeview->ctree), NULL, partinfo);
+ GtkCMCTreeNode *node;
+ node = gtk_cmctree_find_by_row_data(GTK_CMCTREE(mimeview->ctree), NULL, partinfo);
if (node)
- gtk_ctree_select(GTK_CTREE(mimeview->ctree), node);
+ gtk_cmctree_select(GTK_CMCTREE(mimeview->ctree), node);
}
void mimeview_select_mimepart_icon(MimeView *mimeview, MimeInfo *partinfo)
BREAK_ON_MODIFIER_KEY();
mimeview_launch(mimeview, NULL);
return TRUE;
+#ifndef G_OS_WIN32
case GDK_o:
BREAK_ON_MODIFIER_KEY();
mimeview_open_with(mimeview);
return TRUE;
+#endif
case GDK_c:
BREAK_ON_MODIFIER_KEY();
mimeview_check_signature(mimeview);
MimeInfo *partinfo;
MimeInfo *siginfo = NULL;
MimeInfo *encrypted = NULL;
+#ifdef GENERIC_UMPC
+ GtkRequisition r;
+#endif
+#if !(GTK_CHECK_VERSION(2,12,0))
+ GtkTooltips *tips = mimeview->tooltips;
+#endif
+ if (!prefs_common.show_inline_attachments && mimeinfo->id)
+ return;
+
vbox = mimeview->icon_vbox;
mimeview->icon_count++;
button = gtk_event_box_new();
- g_signal_connect(G_OBJECT(button), "visibility-notify-event",
- G_CALLBACK(mimeview_visi_notify), mimeview);
g_signal_connect(G_OBJECT(button), "motion-notify-event",
G_CALLBACK(mimeview_visi_notify), mimeview);
g_signal_connect(G_OBJECT(button), "leave-notify-event",
stockp = STOCK_PIXMAP_MIME_TEXT_ENRICHED;
else if (mimeinfo->subtype && !g_ascii_strcasecmp(mimeinfo->subtype, "calendar"))
stockp = STOCK_PIXMAP_MIME_TEXT_CALENDAR;
+ else if (mimeinfo->subtype && (!g_ascii_strcasecmp(mimeinfo->subtype, "x-patch")
+ || !g_ascii_strcasecmp(mimeinfo->subtype, "x-diff")))
+ stockp = STOCK_PIXMAP_MIME_TEXT_PATCH;
else
stockp = STOCK_PIXMAP_MIME_TEXT_PLAIN;
break;
stockp = STOCK_PIXMAP_MIME_MESSAGE;
break;
case MIMETYPE_APPLICATION:
- if (mimeinfo->subtype && !g_ascii_strcasecmp(mimeinfo->subtype, "pgp-signature"))
+ if (mimeinfo->subtype && (!g_ascii_strcasecmp(mimeinfo->subtype, "pgp-signature")
+ || !g_ascii_strcasecmp(mimeinfo->subtype, "x-pkcs7-signature")
+ || !g_ascii_strcasecmp(mimeinfo->subtype, "pkcs7-signature")))
stockp = STOCK_PIXMAP_MIME_PGP_SIG;
else if (mimeinfo->subtype && !g_ascii_strcasecmp(mimeinfo->subtype, "pdf"))
stockp = STOCK_PIXMAP_MIME_PDF;
STOCK_PIXMAP_PRIVACY_EMBLEM_PASSED, OVERLAY_BOTTOM_RIGHT, 6, 3);
break;
case SIGNATURE_WARN:
+ case SIGNATURE_KEY_EXPIRED:
pixmap = stock_pixmap_widget_with_overlay(mimeview->mainwin->window, stockp,
STOCK_PIXMAP_PRIVACY_EMBLEM_WARN, OVERLAY_BOTTOM_RIGHT, 6, 3);
break;
content_type = procmime_get_content_type_str(mimeinfo->type,
mimeinfo->subtype);
- tip = g_strjoin("\n", content_type,
- to_human_readable(mimeinfo->length), NULL);
+#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;
} else {
tmp = g_strdup(desc);
}
- tiptmp = g_strjoin("\n", tmp, tip, NULL);
+#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);
}
if (sigshort && *sigshort) {
- tiptmp = g_strjoin("\n", tip, sigshort, NULL);
+ tiptmp = g_markup_escape_text(sigshort, -1);
g_free(tip);
tip = tiptmp;
}
g_free(sigshort);
- gtk_tooltips_set_tip(mimeview->tooltips, button, tip, NULL);
+#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,
g_signal_connect(G_OBJECT(button), "drag_data_get",
G_CALLBACK(mimeview_drag_data_get), mimeview);
gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, FALSE, 0);
-#ifdef MAEMO
- gtk_widget_set_size_request(vbox, -1, pixmap->requisition.height + 8);
- gtk_widget_set_size_request(button, -1, pixmap->requisition.height + 4);
+#ifdef GENERIC_UMPC
+ gtk_widget_size_request(pixmap, &r);
+ gtk_widget_set_size_request(button, -1, r.height + 4);
#endif
}
static void icon_list_clear (MimeView *mimeview)
{
- GList *child;
+ GList *child, *orig;
GtkAdjustment *adj;
- child = gtk_container_children(GTK_CONTAINER(mimeview->icon_vbox));
- for (; child != NULL; child = g_list_next(child)) {
+ orig = gtk_container_get_children(GTK_CONTAINER(mimeview->icon_vbox));
+ for (child = orig; child != NULL; child = g_list_next(child)) {
gtkut_container_remove(GTK_CONTAINER(mimeview->icon_vbox),
GTK_WIDGET(child->data));
- gtk_widget_destroy(GTK_WIDGET(child->data));
}
- g_list_free(child);
+ g_list_free(orig);
mimeview->icon_count = 0;
adj = gtk_layout_get_vadjustment(GTK_LAYOUT(mimeview->icon_scroll));
gtk_adjustment_set_value(adj, adj->lower);
GtkAllocation *vbox_size;
GtkAllocation *layout_size;
GtkAdjustment *adj;
-
+
adj = gtk_layout_get_vadjustment(GTK_LAYOUT(mimeview->icon_scroll));
mainbox_size = &mimeview->icon_mainbox->allocation;
{
GtkRequisition size;
- g_return_if_fail(mimeinfo != NULL);
+ cm_return_if_fail(mimeinfo != NULL);
while (mimeinfo != NULL) {
if (mimeinfo->type != MIMETYPE_MULTIPART)
{
GList *child;
- child = gtk_container_children(GTK_CONTAINER(mimeview->icon_vbox));
+ child = gtk_container_get_children(GTK_CONTAINER(mimeview->icon_vbox));
for (; child != NULL; child = g_list_next(child)) {
if (!GTK_IS_EVENT_BOX(child->data))
continue;
static gint mime_toggle_button_cb(GtkWidget *button, GdkEventButton *event,
MimeView *mimeview)
{
- gtk_widget_ref(button);
+ g_object_ref(button);
mimeview_leave_notify(button, NULL, NULL);
mimeview->ctree_mode = !mimeview->ctree_mode;
if (mimeview->ctree_mode) {
- gtk_arrow_set(GTK_ARROW(GTK_BIN(button)->child), GTK_ARROW_RIGHT,
+ gtk_arrow_set(GTK_ARROW(gtk_bin_get_child(GTK_BIN((button)))), GTK_ARROW_RIGHT,
GTK_SHADOW_NONE);
gtk_widget_hide(mimeview->icon_mainbox);
gtk_widget_show(mimeview->ctree_mainbox);
button);
gtk_box_pack_end(GTK_BOX(mimeview->ctree_mainbox),
button, FALSE, FALSE, 0);
- gtk_paned_set_gutter_size(GTK_PANED(mimeview->paned), 6);
} else {
- gtk_arrow_set(GTK_ARROW(GTK_BIN(button)->child), GTK_ARROW_LEFT,
+ gtk_arrow_set(GTK_ARROW(gtk_bin_get_child(GTK_BIN((button)))), GTK_ARROW_LEFT,
GTK_SHADOW_NONE);
mimeview->oldsize = mimeview->ctree_mainbox->allocation.height;
gtk_widget_hide(mimeview->ctree_mainbox);
gtk_box_reorder_child(GTK_BOX(button->parent), button, 0);
if (mimeview->opened)
icon_list_toggle_by_mime_info
- (mimeview, gtk_ctree_node_get_row_data(GTK_CTREE(mimeview->ctree),
+ (mimeview, gtk_cmctree_node_get_row_data(GTK_CMCTREE(mimeview->ctree),
mimeview->opened));
- gtk_paned_set_gutter_size(GTK_PANED(mimeview->paned), 0);
}
- gtk_widget_unref(button);
+ g_object_unref(button);
return TRUE;
}
mimeview_save_as(mimeview);
else if (!strcmp(cmd, "sc://display_as_text"))
mimeview_display_as_text(mimeview);
+#ifndef G_OS_WIN32
else if (!strcmp(cmd, "sc://open_with"))
mimeview_open_with(mimeview);
+#endif
else if (!strcmp(cmd, "sc://open"))
mimeview_launch(mimeview, NULL);
else if (!strcmp(cmd, "sc://select_attachment") && data != NULL) {
projects / claws.git / blobdiff