[balsa/gtk4: 305/312] Various: deprecation cleanup




commit c3e2d254a4248e383229b3752531eb849b654eb1
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Sat Jun 19 17:03:08 2021 -0400

    Various: deprecation cleanup

 src/balsa-mblist.c             | 2 +-
 src/balsa-mime-widget-crypto.c | 6 ++++--
 src/main-window.c              | 2 +-
 src/print-gtk.c                | 4 ++--
 src/sendmsg-window.c           | 2 +-
 5 files changed, 9 insertions(+), 7 deletions(-)
---
diff --git a/src/balsa-mblist.c b/src/balsa-mblist.c
index bc8f8d61b..f24e77e10 100644
--- a/src/balsa-mblist.c
+++ b/src/balsa-mblist.c
@@ -814,7 +814,7 @@ bmbl_drag_drop(GtkDropTarget *drop_target,
 {
     GdkDrop *drop;
 
-    drop = gtk_drop_target_get_drop(drop_target);
+    drop = gtk_drop_target_get_current_drop(drop_target);
     if (drop == NULL)
         return FALSE;
 
diff --git a/src/balsa-mime-widget-crypto.c b/src/balsa-mime-widget-crypto.c
index 8eee153d4..609c951de 100644
--- a/src/balsa-mime-widget-crypto.c
+++ b/src/balsa-mime-widget-crypto.c
@@ -148,12 +148,14 @@ balsa_mime_widget_signature_widget(LibBalsaMessageBody *mime_body,
                                                             hbox, GTK_ALIGN_FILL);
                        g_object_set_data_full(G_OBJECT(button), "autocrypt_key", autocrypt_key, 
(GDestroyNotify) g_bytes_unref);
                        g_signal_connect(button, "clicked", G_CALLBACK(on_key_import_button), NULL);
-                       gtk_box_pack_start(GTK_BOX(hbox), button, TRUE, TRUE, 0);
+
+                        gtk_widget_set_hexpand(button, TRUE);
+                        gtk_widget_set_halign(button, GTK_ALIGN_FILL);
+                        gtk_box_append(GTK_BOX(hbox), button);
                } else if (libbalsa_message_get_headers(mime_body->message)->autocrypt_hdr_present) {
                        libbalsa_information(LIBBALSA_INFORMATION_WARNING,
                                _("The message contains an Autocrypt header, but it is either broken "
                                  "or the signature has been created using a different key."));
-                       gtk_container_add(GTK_CONTAINER(hbox), button);
                }
 #endif
             button = libbalsa_add_mnemonic_button_to_box(_("_Search key server for this key"),
diff --git a/src/main-window.c b/src/main-window.c
index 9ddba10da..898dbc7fa 100644
--- a/src/main-window.c
+++ b/src/main-window.c
@@ -2799,7 +2799,7 @@ bw_notebook_tab_drag_drop(GtkDropTarget *drop_target,
 {
     GdkDrop *drop;
 
-    drop = gtk_drop_target_get_drop(drop_target);
+    drop = gtk_drop_target_get_current_drop(drop_target);
     if (drop == NULL)
         return FALSE;
 
diff --git a/src/print-gtk.c b/src/print-gtk.c
index 259fc8314..e65558fac 100644
--- a/src/print-gtk.c
+++ b/src/print-gtk.c
@@ -709,9 +709,9 @@ message_prefs_apply(GtkPrintOperation * operation, GtkWidget * widget,
     }
 #ifdef HAVE_HTML_WIDGET
     print_prefs->setup->print_alt_html =
-       !gtk_check_button_get_active(GTK_CHECK_BUTTON(print_prefs->html_print));
+        !gtk_check_button_get_active(GTK_CHECK_BUTTON(print_prefs->html_print));
     print_prefs->setup->html_load_images =
-       gtk_check_button_get_active(GTK_CHECK_BUTTON(print_prefs->html_load_imgs));
+        gtk_check_button_get_active(GTK_CHECK_BUTTON(print_prefs->html_load_imgs));
 #endif
 }
 
diff --git a/src/sendmsg-window.c b/src/sendmsg-window.c
index 2352364bc..6932817af 100644
--- a/src/sendmsg-window.c
+++ b/src/sendmsg-window.c
@@ -2380,7 +2380,7 @@ sw_address_view_drop(GtkDropTarget *drop_target,
     GdkDrop *drop;
     const char *address;
 
-    drop = gtk_drop_target_get_drop(drop_target);
+    drop = gtk_drop_target_get_current_drop(drop_target);
 
     if (drop == NULL || !G_VALUE_HOLDS_STRING(value))
         return FALSE;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]