[Merge] ~rs2009/unity:master into unity:master

[Marco Trevisan (Treviño)]

Diff comments:

> diff --git a/debian/changelog b/debian/changelog
> index 15b5358..d9366d2 100644
> --- a/debian/changelog
> +++ b/debian/changelog
> @@ -1,3 +1,17 @@
> +<<<<<<< debian/changelog

Please fix this.

> +=======
> +unity (7.6.0+22.04.20220601.1-0ubuntu1) kinetic; urgency=medium
> +
> +  * Added transparent dash border
> +  * Replaced launcher bfb with Ubuntu Unity logo
> +  * Removed broken app info and ratings from dash
> +  * Simplified app preview in dash
> +  * Fixed the 'Empty Trash' button in the launcher
> +  * Fixed the standalone testing Unity7 launcher
> +
> + -- Rudra Saraswat <rs2009 at ubuntu.com>  Fri, 29 Apr 2022 15:28:29 +0530
> +
> +>>>>>>> debian/changelog
>  unity (7.5.1+22.10.20220818-0ubuntu1) kinetic; urgency=medium
>  
>    [ Alberts Muktupāvels ]
> diff --git a/launcher/QuicklistView.cpp b/launcher/QuicklistView.cpp
> index 55251f9..c36d836 100644
> --- a/launcher/QuicklistView.cpp
> +++ b/launcher/QuicklistView.cpp
> @@ -888,30 +888,7 @@ void ql_tint_dot_hl(cairo_t* cr,
>    dots_pattern = cairo_pattern_create_for_surface(dots_surf.GetSurface());
>  
>    // fill path of normal context with dot-pattern

And drop this too.

> -  cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
> -  cairo_set_source(cr, dots_pattern);
> -  cairo_pattern_set_extend(dots_pattern, CAIRO_EXTEND_REPEAT);
> -  cairo_fill_preserve(cr);
> -  cairo_pattern_destroy(dots_pattern);
> -
> -  // draw highlight
> -  cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
> -  hl_pattern = cairo_pattern_create_radial(hl_x,
> -                                           hl_y,
> -                                           0.0f,
> -                                           hl_x,
> -                                           hl_y,
> -                                           hl_size);
> -  cairo_pattern_add_color_stop_rgba(hl_pattern,
> -                                    0.0f,
> -                                    hl_color.red,
> -                                    hl_color.green,
> -                                    hl_color.blue,
> -                                    hl_color.alpha);
> -  cairo_pattern_add_color_stop_rgba(hl_pattern, 1.0f, 1.0f, 1.0f, 1.0f, 0.0f);
> -  cairo_set_source(cr, hl_pattern);
> -  cairo_fill(cr);
> -  cairo_pattern_destroy(hl_pattern);
> +  // cairo_set_operator(cr, CAIRO_OPERATOR_OVER);

Drop this line and the one above (the comment that doesn't make sense anymore now).

>  }
>  
>  void ql_setup(cairo_surface_t** surf,
> diff --git a/unity-shared/GnomeFileManager.cpp b/unity-shared/GnomeFileManager.cpp
> index bd2a051..1fd6451 100644
> --- a/unity-shared/GnomeFileManager.cpp
> +++ b/unity-shared/GnomeFileManager.cpp
> @@ -214,19 +220,44 @@ bool GnomeFileManager::TrashFile(std::string const& uri)
>    return false;
>  }
>  
> -void GnomeFileManager::EmptyTrash(uint64_t timestamp, Window parent_xid)
> +void GioEmptyTrash (GtkWidget *dialog, int response)
>  {
> -  auto const& proxy = impl_->NautilusOperationsProxy();
> -  const bool ask_confirmation = true;
> +  if (response == GTK_RESPONSE_OK) {
> +    GError *error = NULL;
>  
> -  GVariantBuilder b;
> -  g_variant_builder_init(&b, G_VARIANT_TYPE("(ba{sv})"));
> -  g_variant_builder_add(&b, "b", ask_confirmation);
> -  g_variant_builder_add_value(&b, impl_->GetPlatformData(timestamp, parent_xid));
> -  glib::Variant parameters(g_variant_builder_end(&b));
> +    g_subprocess_new (G_SUBPROCESS_FLAGS_STDOUT_SILENCE, &error, "/usr/bin/gio", "trash", "--empty", NULL);

Do not use "/usr/bin" prefix, you may want to run it in another prefix (like a jhbuild) where you use another prefix).

Also, use the same indentation level.

But more importantly: you're leaking a GSubproject, so please unef it after you've created.

It would be also nice to use g_subprocess_wait_async to print any error if any.

> +  }
> +
> +  gtk_widget_destroy (dialog);
> +}
>  
> -  // Passing the proxy to the lambda we ensure that it will be destroyed when needed
> -  proxy->CallBegin("EmptyTrash", parameters, [proxy] (GVariant*, glib::Error const&) {});
> +void GnomeFileManager::EmptyTrash(uint64_t timestamp, Window parent_xid)
> +{
> +  GtkWidget *dialog, *label, *content_area;
> +  GtkDialogFlags flags;
> +
> +  flags = GTK_DIALOG_DESTROY_WITH_PARENT;
> +  dialog = gtk_dialog_new_with_buttons ("Question",
> +                                        NULL,
> +                                        flags,
> +                                        _("Yes"), GTK_RESPONSE_OK,
> +                                        _("No"), GTK_RESPONSE_CANCEL,
> +                                        NULL);
> +  gtk_widget_set_size_request(dialog, 250, 65);
> +  content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
> +  label = gtk_label_new (_("Do you want to empty the trash?"));
> +
> +  // Ensure that the dialog box is destroyed when the user responds
> +
> +  g_signal_connect_swapped (dialog,
> +                            "response",
> +                            G_CALLBACK (GioEmptyTrash),
> +                            dialog);
> +
> +  // Add the label, and show everything we’ve added
> +
> +  gtk_container_add (GTK_CONTAINER (content_area), label);
> +  gtk_widget_show_all (dialog);
>  }
>  
>  void GnomeFileManager::CopyFiles(std::set<std::string> const& uris, std::string const& dest, uint64_t timestamp, Window parent_xid)


-- 
https://code.launchpad.net/~rs2009/unity/+git/unity/+merge/429299
Your team Unity Team is subscribed to branch unity:master.