[balsa/popover: 29/29] mime-widget-text: Use bmwt_html_ prefix
- From: Peter Bloomfield <peterb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [balsa/popover: 29/29] mime-widget-text: Use bmwt_html_ prefix
- Date: Sat, 6 Jun 2020 14:59:04 +0000 (UTC)
commit b76d1eb793e7ad7c851225a53a1d7269bf2cbf6b
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date: Fri Jun 5 12:35:39 2020 -0400
mime-widget-text: Use bmwt_html_ prefix
for all HTML-related functions.
src/balsa-mime-widget-text.c | 83 ++++++++++++++++++++++----------------------
1 file changed, 42 insertions(+), 41 deletions(-)
---
diff --git a/src/balsa-mime-widget-text.c b/src/balsa-mime-widget-text.c
index 27c1096bb..de5e77085 100644
--- a/src/balsa-mime-widget-text.c
+++ b/src/balsa-mime-widget-text.c
@@ -1123,9 +1123,9 @@ bm_widget_on_url(const gchar *url)
*/
static void
-zoom_in_activated(GSimpleAction *action,
- GVariant *parameter,
- gpointer user_data)
+bmwt_html_zoom_in_activated(GSimpleAction *action,
+ GVariant *parameter,
+ gpointer user_data)
{
GtkWidget *html = user_data;
BalsaMessage *bm = g_object_get_data(G_OBJECT(html), "bm");
@@ -1134,9 +1134,9 @@ zoom_in_activated(GSimpleAction *action,
}
static void
-zoom_out_activated(GSimpleAction *action,
- GVariant *parameter,
- gpointer user_data)
+bmwt_html_zoom_out_activated(GSimpleAction *action,
+ GVariant *parameter,
+ gpointer user_data)
{
GtkWidget *html = user_data;
BalsaMessage *bm = g_object_get_data(G_OBJECT(html), "bm");
@@ -1145,9 +1145,9 @@ zoom_out_activated(GSimpleAction *action,
}
static void
-zoom_reset_activated(GSimpleAction *action,
- GVariant *parameter,
- gpointer user_data)
+bmwt_html_zoom_reset_activated(GSimpleAction *action,
+ GVariant *parameter,
+ gpointer user_data)
{
GtkWidget *html = user_data;
BalsaMessage *bm = g_object_get_data(G_OBJECT(html), "bm");
@@ -1156,9 +1156,9 @@ zoom_reset_activated(GSimpleAction *action,
}
static void
-select_all_activated(GSimpleAction *action,
- GVariant *parameter,
- gpointer user_data)
+bmwt_html_select_all_activated(GSimpleAction *action,
+ GVariant *parameter,
+ gpointer user_data)
{
GtkWidget *html = user_data;
@@ -1166,9 +1166,9 @@ select_all_activated(GSimpleAction *action,
}
static void
-html_open_with_change_state(GSimpleAction *action,
- GVariant *parameter,
- gpointer user_data)
+bmwt_html_open_with_change_state(GSimpleAction *action,
+ GVariant *parameter,
+ gpointer user_data)
{
GtkWidget *html = user_data;
gpointer mime_body = g_object_get_data(G_OBJECT(html), "mime-body");
@@ -1180,9 +1180,9 @@ html_open_with_change_state(GSimpleAction *action,
}
static void
-save_activated(GSimpleAction *action,
- GVariant *parameter,
- gpointer user_data)
+bmwt_html_save_activated(GSimpleAction *action,
+ GVariant *parameter,
+ gpointer user_data)
{
GtkWidget *html = user_data;
gpointer mime_body = g_object_get_data(G_OBJECT(html), "mime-body");
@@ -1191,9 +1191,9 @@ save_activated(GSimpleAction *action,
}
static void
-print_activated(GSimpleAction *action,
- GVariant *parameter,
- gpointer user_data)
+bmwt_html_print_activated(GSimpleAction *action,
+ GVariant *parameter,
+ gpointer user_data)
{
GtkWidget *html = user_data;
@@ -1201,19 +1201,19 @@ print_activated(GSimpleAction *action,
}
static void
-bmwt_populate_popup_menu(BalsaMessage * bm,
- GtkWidget * html,
- GMenu * menu)
+bmwt_html_populate_popup_menu(BalsaMessage * bm,
+ GtkWidget * html,
+ GMenu * menu)
{
GSimpleActionGroup *simple;
static const GActionEntry text_view_popup_entries[] = {
- {"zoom-in", zoom_in_activated},
- {"zoom-out", zoom_out_activated},
- {"zoom-reset", zoom_reset_activated},
- {"select-all", select_all_activated},
- {"open-with", libbalsa_radio_activated, "s", "''", html_open_with_change_state},
- {"save", save_activated},
- {"print", print_activated}
+ {"zoom-in", bmwt_html_zoom_in_activated},
+ {"zoom-out", bmwt_html_zoom_out_activated},
+ {"zoom-reset", bmwt_html_zoom_reset_activated},
+ {"select-all", bmwt_html_select_all_activated},
+ {"open-with", libbalsa_radio_activated, "s", "''", bmwt_html_open_with_change_state},
+ {"save", bmwt_html_save_activated},
+ {"print", bmwt_html_print_activated}
};
GAction *print_action;
GMenu *open_menu;
@@ -1275,7 +1275,8 @@ bmwt_populate_popup_menu(BalsaMessage * bm,
}
static gboolean
-bmwt_html_popup_context_menu(GtkWidget * html, BalsaMessage * bm)
+bmwt_html_popup_context_menu(GtkWidget *html,
+ BalsaMessage *bm)
{
GtkWidget *popover;
const GdkEvent *event;
@@ -1287,7 +1288,7 @@ bmwt_html_popup_context_menu(GtkWidget * html, BalsaMessage * bm)
GMenu *menu;
menu = g_menu_new();
- bmwt_populate_popup_menu(bm, html, menu);
+ bmwt_html_populate_popup_menu(bm, html, menu);
popover = gtk_popover_new_from_model(libbalsa_html_get_view_widget(html), G_MENU_MODEL(menu));
g_object_set_data(G_OBJECT(html), "popover", popover);
}
@@ -1320,11 +1321,11 @@ bmwt_html_popup_context_menu(GtkWidget * html, BalsaMessage * bm)
}
static void
-balsa_gtk_html_button_press_cb(GtkGestureMultiPress *multi_press,
- gint n_press,
- gdouble x,
- gdouble y,
- gpointer user_data)
+bmwt_html_button_press_cb(GtkGestureMultiPress *multi_press,
+ gint n_press,
+ gdouble x,
+ gdouble y,
+ gpointer user_data)
{
BalsaMessage *bm = user_data;
GtkGesture *gesture;
@@ -1335,7 +1336,7 @@ balsa_gtk_html_button_press_cb(GtkGestureMultiPress *multi_press,
if (gdk_event_triggers_context_menu(event)) {
GtkWidget *html = gtk_event_controller_get_widget(GTK_EVENT_CONTROLLER(gesture));
- balsa_gtk_html_popup(html, bm) ;
+ bmwt_html_popup_context_menu(html, bm) ;
}
}
@@ -1362,10 +1363,10 @@ bm_widget_new_html(BalsaMessage * bm, LibBalsaMessageBody * mime_body)
gesture = gtk_gesture_multi_press_new(libbalsa_html_get_view_widget(widget));
gtk_gesture_single_set_button(GTK_GESTURE_SINGLE(gesture), 0);
g_signal_connect(gesture, "pressed",
- G_CALLBACK(balsa_gtk_html_button_press_cb), bm);
+ G_CALLBACK(bmwt_html_button_press_cb), bm);
g_signal_connect(widget, "popup-menu",
- G_CALLBACK(balsa_gtk_html_popup), bm);
+ G_CALLBACK(bmwt_html_popup_context_menu), bm);
return mw;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]