[Commits] [SCM] claws branch, master, updated. 4.3.0-44-g2b61e4b2c
paul at claws-mail.org
paul at claws-mail.org
Thu Oct 17 16:18:32 UTC 2024
The branch, master has been updated
via 2b61e4b2c77c80c0a91e11f81c58d41956a117de (commit)
from 87726652461a966c766a179863229620b21bc36d (commit)
Summary of changes:
src/messageview.c | 2 +-
src/mimeview.c | 20 ++++++++++----------
src/textview.c | 28 ++++++++++++++--------------
3 files changed, 25 insertions(+), 25 deletions(-)
- Log -----------------------------------------------------------------
commit 2b61e4b2c77c80c0a91e11f81c58d41956a117de
Author: Paul <paul at claws-mail.org>
Date: Thu Oct 17 17:18:27 2024 +0100
replace the relic sc: with cm:
diff --git a/src/messageview.c b/src/messageview.c
index c6b415784..db141c4ea 100644
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -1871,7 +1871,7 @@ static void messageview_show_partial_display_cb(NoticeView *noticeview, MessageV
noticeview_hide(messageview->noticeview);
messageview->partial_display_shown = FALSE;
GTK_EVENTS_FLUSH();
- mimeview_handle_cmd(messageview->mimeview, "sc://display_as_text", NULL, NULL);
+ mimeview_handle_cmd(messageview->mimeview, "cm://display_as_text", NULL, NULL);
main_window_cursor_normal(mainwindow_get_mainwindow());
}
diff --git a/src/mimeview.c b/src/mimeview.c
index 2948e437a..60a0ded0a 100644
--- a/src/mimeview.c
+++ b/src/mimeview.c
@@ -2816,28 +2816,28 @@ void mimeview_handle_cmd(MimeView *mimeview, const gchar *cmd, GdkEventButton *e
g_object_set_data(G_OBJECT(mimeview->popupmenu),
"pop_partinfo", NULL);
- if (!strcmp(cmd, "sc://view_log"))
+ if (!strcmp(cmd, "cm://view_log"))
log_window_show(mainwin->logwin);
- else if (!strcmp(cmd, "sc://save_as"))
+ else if (!strcmp(cmd, "cm://save_as"))
mimeview_save_as(mimeview);
- else if (!strcmp(cmd, "sc://display_as_text"))
+ else if (!strcmp(cmd, "cm://display_as_text"))
mimeview_display_as_text(mimeview);
#ifndef G_OS_WIN32
- else if (!strcmp(cmd, "sc://open_with"))
+ else if (!strcmp(cmd, "cm://open_with"))
mimeview_open_with(mimeview);
#endif
- else if (!strcmp(cmd, "sc://open"))
+ else if (!strcmp(cmd, "cm://open"))
mimeview_launch(mimeview, NULL);
- else if (!strcmp(cmd, "sc://select_attachment") && data != NULL) {
+ else if (!strcmp(cmd, "cm://select_attachment") && data != NULL) {
icon_list_toggle_by_mime_info(mimeview, (MimeInfo *)data);
icon_selected(mimeview, -1, (MimeInfo *)data);
- } else if (!strcmp(cmd, "sc://open_attachment") && data != NULL) {
+ } else if (!strcmp(cmd, "cm://open_attachment") && data != NULL) {
mimeview_launch(mimeview, (MimeInfo *)data);
- } else if (!strcmp(cmd, "sc://menu_attachment") && data != NULL) {
+ } else if (!strcmp(cmd, "cm://menu_attachment") && data != NULL) {
mimeview->spec_part = (MimeInfo *)data;
part_button_pressed(mimeview, event, (MimeInfo *)data);
- } else if (!strncmp(cmd, "sc://search_tags:", strlen("sc://search_tags:"))) {
- const gchar *tagname = cmd + strlen("sc://search_tags:");
+ } else if (!strncmp(cmd, "cm://search_tags:", strlen("cm://search_tags:"))) {
+ const gchar *tagname = cmd + strlen("cm://search_tags:");
gchar *buf = g_strdup_printf("tag matchcase \"%s\"", tagname);
gtk_toggle_button_set_active(
GTK_TOGGLE_BUTTON(mimeview->messageview->mainwin->summaryview->toggle_search),
diff --git a/src/textview.c b/src/textview.c
index 0e7b3ae18..cf57a2486 100644
--- a/src/textview.c
+++ b/src/textview.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2023 the Claws Mail team and Hiroyuki Yamamoto
+ * Copyright (C) 1999-2024 the Claws Mail team and Hiroyuki Yamamoto
*
* 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
@@ -717,7 +717,7 @@ static void textview_add_part(TextView *textview, MimeInfo *mimeinfo)
|| (mimeinfo->disposition == DISPOSITIONTYPE_INLINE &&
mimeinfo->type != MIMETYPE_TEXT)) {
gtk_text_buffer_insert(buffer, &iter, "\n", 1);
- TEXTVIEW_INSERT_LINK(buf, "sc://select_attachment", mimeinfo);
+ TEXTVIEW_INSERT_LINK(buf, "cm://select_attachment", mimeinfo);
gtk_text_buffer_insert(buffer, &iter, " \n", -1);
if (mimeinfo->type == MIMETYPE_IMAGE &&
prefs_common.inline_img ) {
@@ -752,7 +752,7 @@ static void textview_add_part(TextView *textview, MimeInfo *mimeinfo)
uri = g_new0(ClickableText, 1);
uri->uri = g_strdup("");
- uri->filename = g_strdup("sc://select_attachment");
+ uri->filename = g_strdup("cm://select_attachment");
uri->data = mimeinfo;
uri->start = gtk_text_iter_get_offset(&iter);
@@ -883,7 +883,7 @@ void textview_show_error(TextView *textview)
" This is probably due to a network error.\n"
"\n"
" Use "));
- TEXTVIEW_INSERT_LINK(_("'Network Log'"), "sc://view_log", NULL);
+ TEXTVIEW_INSERT_LINK(_("'Network Log'"), "cm://view_log", NULL);
TEXTVIEW_INSERT(_(" in the Tools menu for more information."));
textview_show_icon(textview, "dialog-error");
}
@@ -957,7 +957,7 @@ void textview_show_mime_part(TextView *textview, MimeInfo *partinfo)
TEXTVIEW_INSERT("\n");
TEXTVIEW_INSERT(_(" - To save, select "));
- TEXTVIEW_INSERT_LINK(_("'Save as...'"), "sc://save_as", NULL);
+ TEXTVIEW_INSERT_LINK(_("'Save as...'"), "cm://save_as", NULL);
#ifndef GENERIC_UMPC
TEXTVIEW_INSERT(_(" (Shortcut key: '"));
shortcut = cm_menu_item_get_shortcut(ui_manager, "Menu/File/SavePartAs");
@@ -968,7 +968,7 @@ void textview_show_mime_part(TextView *textview, MimeInfo *partinfo)
TEXTVIEW_INSERT("\n");
TEXTVIEW_INSERT(_(" - To display as text, select "));
- TEXTVIEW_INSERT_LINK(_("'Display as text'"), "sc://display_as_text", NULL);
+ TEXTVIEW_INSERT_LINK(_("'Display as text'"), "cm://display_as_text", NULL);
#ifndef GENERIC_UMPC
TEXTVIEW_INSERT(_(" (Shortcut key: '"));
@@ -980,7 +980,7 @@ void textview_show_mime_part(TextView *textview, MimeInfo *partinfo)
TEXTVIEW_INSERT("\n");
TEXTVIEW_INSERT(_(" - To open with an external program, select "));
- TEXTVIEW_INSERT_LINK(_("'Open'"), "sc://open", NULL);
+ TEXTVIEW_INSERT_LINK(_("'Open'"), "cm://open", NULL);
#ifndef GENERIC_UMPC
TEXTVIEW_INSERT(_(" (Shortcut key: '"));
@@ -992,7 +992,7 @@ void textview_show_mime_part(TextView *textview, MimeInfo *partinfo)
TEXTVIEW_INSERT(_("mouse button)\n"));
#ifndef G_OS_WIN32
TEXTVIEW_INSERT(_(" - Or use "));
- TEXTVIEW_INSERT_LINK(_("'Open with...'"), "sc://open_with", NULL);
+ TEXTVIEW_INSERT_LINK(_("'Open with...'"), "cm://open_with", NULL);
TEXTVIEW_INSERT(_(" (Shortcut key: '"));
shortcut = cm_menu_item_get_shortcut(ui_manager, "Menu/View/Part/OpenWith");
TEXTVIEW_INSERT(shortcut);
@@ -2240,7 +2240,7 @@ static void textview_show_tags(TextView *textview)
cur_tag, -1,
"link", "header", "tags", NULL);
uri->end = gtk_text_iter_get_offset(&iter);
- uri->filename = g_strdup_printf("sc://search_tags:%s", cur_tag);
+ uri->filename = g_strdup_printf("cm://search_tags:%s", cur_tag);
uri->data = NULL;
textview->uri_list =
g_slist_prepend(textview->uri_list, uri);
@@ -2971,18 +2971,18 @@ static gboolean textview_uri_button_pressed(GtkTextTag *tag, GObject *obj,
return FALSE;
} else if ((event->type == (qlink ? GDK_2BUTTON_PRESS:GDK_BUTTON_PRESS) && bevent->button == 1) ||
bevent->button == 2 || bevent->button == 3) {
- if (uri->filename && !g_ascii_strncasecmp(uri->filename, "sc://", 5)) {
+ if (uri->filename && !g_ascii_strncasecmp(uri->filename, "cm://", 5)) {
MimeView *mimeview =
(textview->messageview)?
textview->messageview->mimeview:NULL;
if (mimeview && bevent->button == 1) {
mimeview_handle_cmd(mimeview, uri->filename, NULL, uri->data);
} else if (mimeview && bevent->button == 2 &&
- !g_ascii_strcasecmp(uri->filename, "sc://select_attachment")) {
- mimeview_handle_cmd(mimeview, "sc://open_attachment", NULL, uri->data);
+ !g_ascii_strcasecmp(uri->filename, "cm://select_attachment")) {
+ mimeview_handle_cmd(mimeview, "cm://open_attachment", NULL, uri->data);
} else if (mimeview && bevent->button == 3 &&
- !g_ascii_strcasecmp(uri->filename, "sc://select_attachment")) {
- mimeview_handle_cmd(mimeview, "sc://menu_attachment", bevent, uri->data);
+ !g_ascii_strcasecmp(uri->filename, "cm://select_attachment")) {
+ mimeview_handle_cmd(mimeview, "cm://menu_attachment", bevent, uri->data);
}
return TRUE;
} else if (qlink && bevent->button == 1) {
-----------------------------------------------------------------------
hooks/post-receive
--
Claws Mail
More information about the Commits
mailing list