[Merge] ~azzar1/ubuntu/+source/gtk+3.0:ubuntu/bionic-fix-lp-1592177 into ~ubuntu-desktop/ubuntu/+source/gtk+3.0:ubuntu/bionic
Andrea Azzarone has proposed merging ~azzar1/ubuntu/+source/gtk+3.0:ubuntu/bionic-fix-lp-1592177 into ~ubuntu-desktop/ubuntu/+source/gtk+3.0:ubuntu/bionic. Commit message: d/p/restore_filechooser_typeaheadfind.patch: Disable typeahead if in search mode In search mode we need to disable typeahead to avoid that the tree view steals the focus away from the search text entry. Closes: https://bugs.launchpad.net/bugs/1592177 Requested reviews: Ubuntu Desktop (ubuntu-desktop) For more details, see: https://code.launchpad.net/~azzar1/ubuntu/+source/gtk+3.0/+git/gtk+3.0/+merge/364501 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~azzar1/ubuntu/+source/gtk+3.0:ubuntu/bionic-fix-lp-1592177 into ~ubuntu-desktop/ubuntu/+source/gtk+3.0:ubuntu/bionic. diff --git a/debian/changelog b/debian/changelog index db95e02..9539d1b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,15 @@ gtk+3.0 (3.22.30-1ubuntu3) UNRELEASED; urgency=medium + [ Sebastien Bacher ] * d/p/Check-for-NULL-priv-popup_window-in-gtk_combo_box_popdown.patch: - Check for NULL priv->popup_window in gtk_combo_box_popdown() (lp: #1816032) - -- Sebastien Bacher Fri, 15 Mar 2019 13:13:02 +0100 + [ Andrea Azzarone ] + * d/p/restore_filechooser_typeaheadfind.patch: +- Disable typeahead if in search mode (LP: #1592177) + + -- Andrea Azzarone Fri, 15 Mar 2019 14:50:04 + gtk+3.0 (3.22.30-1ubuntu2) bionic; urgency=medium diff --git a/debian/patches/restore_filechooser_typeaheadfind.patch b/debian/patches/restore_filechooser_typeaheadfind.patch index a943a2a..11cbcfc 100644 --- a/debian/patches/restore_filechooser_typeaheadfind.patch +++ b/debian/patches/restore_filechooser_typeaheadfind.patch @@ -35,3 +35,19 @@ Index: gtk+3.0-3.22.29-2ubuntu1/gtk/gtkfilechooserwidget.c } static gboolean +@@ -3082,6 +3082,7 @@ + search_stop_searching (impl, TRUE); + search_clear_model (impl, TRUE); + gtk_widget_hide (impl->priv->remote_warning_bar); ++ gtk_tree_view_set_enable_search (GTK_TREE_VIEW (impl->priv->browse_files_tree_view), TRUE); + } + } + +@@ -3134,6 +3135,7 @@ + location_bar_update (impl); + search_setup_widgets (impl); + gtk_widget_set_sensitive (priv->filter_combo, FALSE); ++ gtk_tree_view_set_enable_search (GTK_TREE_VIEW (priv->browse_files_tree_view), FALSE); + } + + static void -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] lp:~khurshid-alam/unity-control-center/info-panel-fix into lp:unity-control-center
The proposal to merge lp:~khurshid-alam/unity-control-center/info-panel-fix into lp:unity-control-center has been updated. Commit message changed to: info: Fix crashes when retrieving disk size The panel crashes against glib >= 2.59.2 because GUnixMountPoint is by mistake used as GUnixMountEntry. See https://gitlab.gnome.org/GNOME/gnome-control-center/merge_requests/432 For more details, see: https://code.launchpad.net/~khurshid-alam/unity-control-center/info-panel-fix/+merge/364613 -- Your team Unity Control Center development team is subscribed to branch lp:unity-control-center. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] lp:~khurshid-alam/unity-control-center/info-panel-fix into lp:unity-control-center
Khurshid Alam has proposed merging
lp:~khurshid-alam/unity-control-center/info-panel-fix into
lp:unity-control-center.
Commit message:
info: Fix crashes when retrieving disk size
The panel crashes against glib >= 2,59.2 because GUnixMountPoint is by mistake
used as GUnixMountEntry.
See https://gitlab.gnome.org/GNOME/gnome-control-center/merge_requests/432
Requested reviews:
Sebastien Bacher (seb128)
Related bugs:
Bug #1819368 in unity-control-center (Ubuntu): "unity-control-center crashed
with SIGSEGV in free()"
https://bugs.launchpad.net/ubuntu/+source/unity-control-center/+bug/1819368
For more details, see:
https://code.launchpad.net/~khurshid-alam/unity-control-center/info-panel-fix/+merge/364613
--
Your team Unity Control Center development team is subscribed to branch
lp:unity-control-center.
=== modified file 'panels/info/cc-info-panel.c'
--- panels/info/cc-info-panel.c 2016-06-12 12:50:32 +
+++ panels/info/cc-info-panel.c 2019-03-16 07:33:01 +
@@ -579,14 +579,38 @@
g_object_unref (file);
}
+static GList *
+convert_points_to_entries (GList *points)
+{
+ GList *entries = NULL;
+ GList *p;
+
+ for (p = points; p != NULL; p = p->next)
+{
+ GUnixMountPoint *point = p->data;
+ GUnixMountEntry *mount;
+ const gchar *mount_path = g_unix_mount_point_get_mount_path (point);
+
+ mount = g_unix_mount_at (mount_path, NULL);
+ if (mount)
+entries = g_list_append (entries, mount);
+}
+
+ return entries;
+}
+
static void
get_primary_disc_info (CcInfoPanel *self)
{
- GList*points;
- GList*p;
+ GList *points, *entries = NULL;
+ GList *p;
points = g_unix_mount_points_get (NULL);
- for (p = points; p != NULL; p = p->next)
+
+ entries = convert_points_to_entries (points);
+ g_list_free_full (points, (GDestroyNotify) g_unix_mount_point_free);
+
+ for (p = entries; p != NULL; p = p->next)
{
GUnixMountEntry *mount = p->data;
const char *mount_path;
@@ -604,7 +628,7 @@
self->priv->primary_mounts = g_list_prepend (self->priv->primary_mounts, mount);
}
- g_list_free (points);
+ g_list_free (entries);
get_primary_disc_info_start (self);
}
--
ubuntu-desktop mailing list
ubuntu-desktop@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~azzar1/ubuntu/+source/gtk+3.0:ubuntu/bionic-fix-lp-1592177 into ~ubuntu-desktop/ubuntu/+source/gtk+3.0:ubuntu/bionic
The proposal to merge ~azzar1/ubuntu/+source/gtk+3.0:ubuntu/bionic-fix-lp-1592177 into ~ubuntu-desktop/ubuntu/+source/gtk+3.0:ubuntu/bionic has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~azzar1/ubuntu/+source/gtk+3.0/+git/gtk+3.0/+merge/364501 -- Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/gtk+3.0:ubuntu/bionic. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~azzar1/ubuntu/+source/gtk+3.0:ubuntu/bionic-fix-lp-1592177 into ~ubuntu-desktop/ubuntu/+source/gtk+3.0:ubuntu/bionic
Review: Approve That makes sense! -- https://code.launchpad.net/~azzar1/ubuntu/+source/gtk+3.0/+git/gtk+3.0/+merge/364501 Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/gtk+3.0:ubuntu/bionic. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~azzar1/ubuntu/+source/gtk+3.0:ubuntu/bionic-fix-lp-1592177 into ~ubuntu-desktop/ubuntu/+source/gtk+3.0:ubuntu/bionic
The proposal to merge ~azzar1/ubuntu/+source/gtk+3.0:ubuntu/bionic-fix-lp-1592177 into ~ubuntu-desktop/ubuntu/+source/gtk+3.0:ubuntu/bionic has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~azzar1/ubuntu/+source/gtk+3.0/+git/gtk+3.0/+merge/364501 -- Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/gtk+3.0:ubuntu/bionic. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
