Merge pull request #956 from mjakeman/donations-fixes

Donations fixes

Author: oscfdezdz

src/exm-detail-view.blp

@@ -266,6 +266,21 @@ template $ExmDetailView: Adw.NavigationPage {
                     }
                   }
 
+                  Adw.ActionRow link_donation {
+                    [prefix]
+                    Gtk.Image {
+                      icon-name: "donation-symbolic";
+                    }
+
+                    title: _("Donate");
+                    activatable: true;
+
+                    [suffix]
+                    Gtk.Image {
+                      icon-name: "external-link-symbolic";
+                    }
+                  }
+
                   Adw.ExpanderRow links_donations {
                     [prefix]
                     Gtk.Image {

src/exm-detail-view.c

@@ -82,6 +82,7 @@ struct _ExmDetailView
 
     AdwActionRow *link_homepage;
     gchar *uri_homepage;
+    AdwActionRow *link_donation;
     AdwExpanderRow *links_donations;
     gchar **uri_donations;
     GList *donation_rows_list;
@@ -340,7 +341,7 @@ new_donation_row (ExmDetailView *self,
     adw_preferences_row_set_title (ADW_PREFERENCES_ROW (row), self->uri_donations[num_donation]);
     gtk_list_box_row_set_activatable (GTK_LIST_BOX_ROW (row), TRUE);
 
-    gtk_actionable_set_action_name (GTK_ACTIONABLE (row), "detail.open-donation");
+    gtk_actionable_set_action_name (GTK_ACTIONABLE (row), "detail.open-donations");
     gtk_actionable_set_action_target_value (GTK_ACTIONABLE (row), g_variant_new_int32 (num_donation));
 
     external_link_icon = gtk_image_new_from_icon_name ("external-link-symbolic");
@@ -365,25 +366,41 @@ static void
 update_donation_rows (ExmDetailView  *self,
                       gchar         **donation_urls)
 {
+    guint n_urls;
+
+    gtk_widget_set_visible (GTK_WIDGET (self->link_donation), FALSE);
     gtk_widget_set_visible (GTK_WIDGET (self->links_donations), FALSE);
     delete_donation_rows (self);
 
     if (donation_urls == NULL || donation_urls[0] == NULL)
         return;
 
-    self->uri_donations = g_new0 (gchar *, g_strv_length (donation_urls));
+    n_urls = g_strv_length (donation_urls);
+
+    self->uri_donations = g_new0 (gchar *, n_urls);
 
-    for (int i = 0; donation_urls[i] != NULL; i++)
+    for (guint i = 0; donation_urls[i] != NULL; i++)
     {
         self->uri_donations[i] = g_uri_resolve_relative (donation_urls[i],
                                                          "",
                                                          G_URI_FLAGS_NONE,
                                                          NULL);
-        new_donation_row (self, i);
     }
 
-    adw_expander_row_set_expanded (self->links_donations, FALSE);
-    gtk_widget_set_visible (GTK_WIDGET (self->links_donations), TRUE);
+    if (n_urls == 1)
+    {
+        adw_action_row_set_subtitle (self->link_donation, self->uri_donations[0]);
+        gtk_actionable_set_action_name (GTK_ACTIONABLE (self->link_donation), "detail.open-donation");
+        gtk_widget_set_visible (GTK_WIDGET (self->link_donation), TRUE);
+    }
+    else
+    {
+        for (guint i = 0; donation_urls[i] != NULL; i++)
+            new_donation_row (self, i);
+
+        adw_expander_row_set_expanded (self->links_donations, FALSE);
+        gtk_widget_set_visible (GTK_WIDGET (self->links_donations), TRUE);
+    }
 }
 
 static gchar *
@@ -782,12 +799,16 @@ open_link (ExmDetailView *self,
     {
         uri = gtk_uri_launcher_new (self->uri_homepage);
     }
-    else if (strcmp (action_name, "detail.open-donation") == 0)
+    else if (strcmp (action_name, "detail.open-donations") == 0)
     {
         guint val;
         g_variant_get (param, "i", &val);
         uri = gtk_uri_launcher_new (self->uri_donations[val]);
     }
+    else if (strcmp (action_name, "detail.open-donation") == 0)
+    {
+        uri = gtk_uri_launcher_new (self->uri_donations[0]);
+    }
     else
     {
         g_critical ("open_link() invalid action: %s", action_name);
@@ -904,6 +925,7 @@ exm_detail_view_class_init (ExmDetailViewClass *klass)
     gtk_widget_class_bind_template_child (widget_class, ExmDetailView, session_modes_row);
     gtk_widget_class_bind_template_child (widget_class, ExmDetailView, session_modes_label);
     gtk_widget_class_bind_template_child (widget_class, ExmDetailView, link_homepage);
+    gtk_widget_class_bind_template_child (widget_class, ExmDetailView, link_donation);
     gtk_widget_class_bind_template_child (widget_class, ExmDetailView, links_donations);
     gtk_widget_class_bind_template_child (widget_class, ExmDetailView, link_extensions);
     gtk_widget_class_bind_template_child (widget_class, ExmDetailView, scroll_area);
@@ -918,7 +940,8 @@ exm_detail_view_class_init (ExmDetailViewClass *klass)
     gtk_widget_class_install_action (widget_class, "detail.show-versions", NULL, show_versions);
     gtk_widget_class_install_action (widget_class, "detail.open-extensions", NULL, (GtkWidgetActionActivateFunc) open_link);
     gtk_widget_class_install_action (widget_class, "detail.open-homepage", NULL, (GtkWidgetActionActivateFunc) open_link);
-    gtk_widget_class_install_action (widget_class, "detail.open-donation", "i", (GtkWidgetActionActivateFunc) open_link);
+    gtk_widget_class_install_action (widget_class, "detail.open-donations", "i", (GtkWidgetActionActivateFunc) open_link);
+    gtk_widget_class_install_action (widget_class, "detail.open-donation", NULL, (GtkWidgetActionActivateFunc) open_link);
 }
 
 static void

src/local/exm-manager.c

@@ -547,7 +547,7 @@ parse_single_extension (ExmExtension **extension,
     gboolean is_user = FALSE;
     ExmExtensionType type = EXM_EXTENSION_TYPE_SYSTEM;
     GPtrArray *session_modes = g_ptr_array_new_with_free_func (g_free);
-    GHashTable *donations = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
+    GHashTable *donations = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, (GDestroyNotify) g_ptr_array_unref);
 
     if (extension && *extension)
     {
@@ -643,12 +643,31 @@ parse_single_extension (ExmExtension **extension,
         else if (g_strcmp0 (prop_name, "donations") == 0)
         {
             GVariantIter iter;
+            GVariant *donation_entry;
             gchar *key;
             g_variant_iter_init (&iter, prop_value);
-            while (g_variant_iter_loop (&iter, "{sv}", &key, &prop_value))
+
+            while (g_variant_iter_loop (&iter, "{sv}", &key, &donation_entry))
             {
-                const gchar *donation_value = g_variant_get_string (prop_value, NULL);
-                g_hash_table_insert (donations, g_strdup (key), g_strdup (donation_value));
+                GPtrArray *usernames = g_ptr_array_new_with_free_func (g_free);
+
+                if (g_variant_is_of_type (donation_entry, G_VARIANT_TYPE_STRING))
+                {
+                    g_ptr_array_add (usernames, g_variant_dup_string (donation_entry, NULL));
+                }
+                else if (g_variant_is_container (donation_entry))
+                {
+                    for (gsize j = 0; j < g_variant_n_children (donation_entry); j++)
+                    {
+                        GVariant *child_v = g_variant_get_child_value (donation_entry, j);
+                        GVariant *child_s = g_variant_get_variant (child_v);
+                        g_ptr_array_add (usernames, g_variant_dup_string (child_s, NULL));
+                        g_variant_unref (child_s);
+                        g_variant_unref (child_v);
+                    }
+                }
+
+                g_hash_table_insert (donations, g_strdup (key), usernames);
             }
         }
     }