[Pkg-xfce-commits] r4556 - in desktop/branches/experimental/xfce4-panel/debian: . patches

Yves-Alexis Perez corsac at alioth.debian.org
Tue Nov 9 12:12:04 UTC 2010


Author: corsac
Date: 2010-11-09 12:11:49 +0000 (Tue, 09 Nov 2010)
New Revision: 4556

Added:
   desktop/branches/experimental/xfce4-panel/debian/patches/
   desktop/branches/experimental/xfce4-panel/debian/patches/01_fix-crash-tasklist-group.patch
   desktop/branches/experimental/xfce4-panel/debian/patches/02_drop-automatic-grouping.patch
   desktop/branches/experimental/xfce4-panel/debian/patches/10_ignore-translation-quilt.patch
   desktop/branches/experimental/xfce4-panel/debian/patches/series
Modified:
   desktop/branches/experimental/xfce4-panel/debian/changelog
Log:
* debian/patches:
  - 01_fix-crash-tasklist-group added, fix crash when grouping tasks.
  - 02_drop-automatic-grouping added, drop automatic grouping option since
    it's not yet implemented.
  - 10_ignore-translation-quilt added, ignore translations in .pc quilt
    folder.

Modified: desktop/branches/experimental/xfce4-panel/debian/changelog
===================================================================
--- desktop/branches/experimental/xfce4-panel/debian/changelog	2010-11-07 18:03:44 UTC (rev 4555)
+++ desktop/branches/experimental/xfce4-panel/debian/changelog	2010-11-09 12:11:49 UTC (rev 4556)
@@ -35,8 +35,14 @@
     - add hardening flags to {C,LD}FLAGS
   * debian/control:
     - add build-dep on hardening-includes
+  * debian/patches:
+    - 01_fix-crash-tasklist-group added, fix crash when grouping tasks.
+    - 02_drop-automatic-grouping added, drop automatic grouping option since
+      it's not yet implemented.
+    - 10_ignore-translation-quilt added, ignore translations in .pc quilt
+      folder.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Fri, 05 Nov 2010 08:54:19 +0100
+ -- Yves-Alexis Perez <corsac at debian.org>  Tue, 09 Nov 2010 11:06:13 +0100
 
 xfce4-panel (4.6.4-1) unstable; urgency=low
 

Added: desktop/branches/experimental/xfce4-panel/debian/patches/01_fix-crash-tasklist-group.patch
===================================================================
--- desktop/branches/experimental/xfce4-panel/debian/patches/01_fix-crash-tasklist-group.patch	                        (rev 0)
+++ desktop/branches/experimental/xfce4-panel/debian/patches/01_fix-crash-tasklist-group.patch	2010-11-09 12:11:49 UTC (rev 4556)
@@ -0,0 +1,35 @@
+commit bb6b1ef03c05dfd7f8209e923c2e8ec5365ccaac
+Author: Nick Schermer <nick at xfce.org>
+Date:   Mon Nov 8 21:53:56 2010 +0100
+
+    Fix crash in always group mode (bug #6792).
+
+diff --git a/plugins/tasklist/tasklist-widget.c b/plugins/tasklist/tasklist-widget.c
+index cdf696d..72283ba 100644
+--- a/plugins/tasklist/tasklist-widget.c
++++ b/plugins/tasklist/tasklist-widget.c
+@@ -1586,6 +1586,7 @@ xfce_tasklist_update_icon_geometries (gpointer data)
+ 
+   toplevel = gtk_widget_get_toplevel (GTK_WIDGET (tasklist));
+   gtk_window_get_position (GTK_WINDOW (toplevel), &root_x, &root_y);
++  panel_return_val_if_fail (XFCE_IS_TASKLIST (tasklist), FALSE);
+ 
+   for (li = tasklist->windows; li != NULL; li = li->next)
+     {
+@@ -1603,7 +1604,7 @@ xfce_tasklist_update_icon_geometries (gpointer data)
+ 
+         case CHILD_TYPE_GROUP:
+           alloc = &child->button->allocation;
+-          for (lp = child->windows; li != NULL; li = li->next)
++          for (lp = child->windows; lp != NULL; lp = lp->next)
+             {
+               child2 = lp->data;
+               panel_return_val_if_fail (WNCK_IS_WINDOW (child2->window), FALSE);
+@@ -2382,7 +2383,6 @@ xfce_tasklist_button_activate (XfceTasklistChild *child,
+   WnckWorkspace *workspace;
+ 
+   panel_return_if_fail (XFCE_IS_TASKLIST (child->tasklist));
+-  panel_return_if_fail (child->type == CHILD_TYPE_WINDOW);
+   panel_return_if_fail (WNCK_IS_WINDOW (child->window));
+ 
+   if (wnck_window_is_active (child->window))

Added: desktop/branches/experimental/xfce4-panel/debian/patches/02_drop-automatic-grouping.patch
===================================================================
--- desktop/branches/experimental/xfce4-panel/debian/patches/02_drop-automatic-grouping.patch	                        (rev 0)
+++ desktop/branches/experimental/xfce4-panel/debian/patches/02_drop-automatic-grouping.patch	2010-11-09 12:11:49 UTC (rev 4556)
@@ -0,0 +1,118 @@
+commit 50c4281e5b8c36107732d0d48dd55e5ee7b9b549
+Author: Nick Schermer <nick at xfce.org>
+Date:   Mon Nov 8 22:10:16 2010 +0100
+
+    Drop the automatics grouping option from tasklist.
+    
+    Not implemented yet, so avoid the confusion.
+
+diff --git a/plugins/tasklist/tasklist-dialog.glade b/plugins/tasklist/tasklist-dialog.glade
+index a2e19a0..a779d52 100644
+--- a/plugins/tasklist/tasklist-dialog.glade
++++ b/plugins/tasklist/tasklist-dialog.glade
+@@ -349,10 +349,10 @@
+         <col id="0" translatable="yes">Never</col>
+       </row>
+       <row>
+-        <col id="0" translatable="yes">When space is limited</col>
++        <col id="0" translatable="yes">Always</col>
+       </row>
+       <row>
+-        <col id="0" translatable="yes">Always</col>
++        <col id="0" translatable="yes">When space is limited</col>
+       </row>
+     </data>
+   </object>
+diff --git a/plugins/tasklist/tasklist-widget.c b/plugins/tasklist/tasklist-widget.c
+index 72283ba..23cd967 100644
+--- a/plugins/tasklist/tasklist-widget.c
++++ b/plugins/tasklist/tasklist-widget.c
+@@ -307,7 +307,7 @@ xfce_tasklist_class_init (XfceTasklistClass *klass)
+                                    g_param_spec_uint ("grouping",
+                                                       NULL, NULL,
+                                                       XFCE_TASKLIST_GROUPING_MIN,
+-                                                      XFCE_TASKLIST_GROUPING_MAX,
++                                                      XFCE_TASKLIST_GROUPING_MAX + 1 /* TODO drop this later */,
+                                                       XFCE_TASKLIST_GROUPING_DEFAULT,
+                                                       EXO_PARAM_READWRITE));
+ 
+@@ -765,10 +765,12 @@ xfce_tasklist_size_layout (XfceTasklist *tasklist,
+       n_buttons = tasklist->n_windows;
+       n_buttons_target = ((alloc->width / max_button_length) + 1) * rows;
+ 
++#if 0
+       if (tasklist->grouping == XFCE_TASKLIST_GROUPING_AUTO)
+         {
+           /* try creating group buttons */
+         }
++#endif
+ 
+       /* we now push the windows with the lowest score in the
+        * overflow menu */
+@@ -2918,9 +2920,11 @@ xfce_tasklist_group_button_child_destroyed (XfceTasklistChild *group_child,
+     }
+ 
+   if ((group_child->tasklist->grouping == XFCE_TASKLIST_GROUPING_ALWAYS
+-       && n_children > 0)
++       && n_children > 0))
++#if 0
+       || (group_child->tasklist->grouping == XFCE_TASKLIST_GROUPING_AUTO
+           && n_children > 1))
++#endif
+     {
+       xfce_tasklist_group_button_child_visible_changed (group_child);
+       xfce_tasklist_group_button_name_changed (NULL, group_child);
+@@ -3148,6 +3152,10 @@ xfce_tasklist_set_grouping (XfceTasklist         *tasklist,
+ {
+   panel_return_if_fail (XFCE_IS_TASKLIST (tasklist));
+ 
++  /* TODO avoid overflow, because we allows + 1 in the object */
++  if (grouping > XFCE_TASKLIST_GROUPING_MAX)
++    grouping = XFCE_TASKLIST_GROUPING_MAX;
++
+   if (tasklist->grouping != grouping)
+     {
+       tasklist->grouping = grouping;
+diff --git a/plugins/tasklist/tasklist-widget.h b/plugins/tasklist/tasklist-widget.h
+index c903260..c0574e4 100644
+--- a/plugins/tasklist/tasklist-widget.h
++++ b/plugins/tasklist/tasklist-widget.h
+@@ -40,12 +40,12 @@ typedef enum   _XfceTasklistSortOrder XfceTasklistSortOrder;
+ enum _XfceTasklistGrouping
+ {
+   XFCE_TASKLIST_GROUPING_NEVER,
+-  XFCE_TASKLIST_GROUPING_AUTO, /* when space is limited */
+   XFCE_TASKLIST_GROUPING_ALWAYS,
++  /*XFCE_TASKLIST_GROUPING_AUTO, *//* when space is limited */
+ 
+   XFCE_TASKLIST_GROUPING_MIN = XFCE_TASKLIST_GROUPING_NEVER,
+   XFCE_TASKLIST_GROUPING_MAX = XFCE_TASKLIST_GROUPING_ALWAYS,
+-  XFCE_TASKLIST_GROUPING_DEFAULT = XFCE_TASKLIST_GROUPING_AUTO
++  XFCE_TASKLIST_GROUPING_DEFAULT = XFCE_TASKLIST_GROUPING_NEVER
+ };
+ 
+ enum _XfceTasklistSortOrder
+diff --git a/plugins/tasklist/tasklist.c b/plugins/tasklist/tasklist.c
+index d69c1b9..407a150 100644
+--- a/plugins/tasklist/tasklist.c
++++ b/plugins/tasklist/tasklist.c
+@@ -185,6 +185,7 @@ tasklist_plugin_configure_plugin (XfcePanelPlugin *panel_plugin)
+   GtkBuilder     *builder;
+   GObject        *dialog;
+   GObject        *object;
++  GtkTreeIter     iter;
+ 
+   /* setup the dialog */
+   PANEL_UTILS_LINK_4UI
+@@ -222,6 +223,11 @@ tasklist_plugin_configure_plugin (XfcePanelPlugin *panel_plugin)
+   gtk_widget_hide (GTK_WIDGET (object));
+ #endif
+ 
++  /* TODO: remove this if always group is supported */
++  object = gtk_builder_get_object (builder, "grouping-model");
++  if (gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (object), &iter, NULL, 2))
++    gtk_list_store_remove (GTK_LIST_STORE (object), &iter);
++
+   gtk_widget_show (GTK_WIDGET (dialog));
+ }
+ 

Added: desktop/branches/experimental/xfce4-panel/debian/patches/10_ignore-translation-quilt.patch
===================================================================
--- desktop/branches/experimental/xfce4-panel/debian/patches/10_ignore-translation-quilt.patch	                        (rev 0)
+++ desktop/branches/experimental/xfce4-panel/debian/patches/10_ignore-translation-quilt.patch	2010-11-09 12:11:49 UTC (rev 4556)
@@ -0,0 +1,6 @@
+--- /dev/null	2010-10-29 15:20:25.168000000 +0200
++++ xfce4-panel/po/POTFILES.skip	2010-11-09 11:05:40.000000000 +0100
+@@ -0,0 +1,3 @@
++.pc/01_fix-crash-tasklist-group.patch/plugins/tasklist/tasklist-widget.c
++.pc/02_drop-automatic-grouping.patch/plugins/tasklist/tasklist-dialog.glade
++.pc/02_drop-automatic-grouping.patch/plugins/tasklist/tasklist-widget.c

Added: desktop/branches/experimental/xfce4-panel/debian/patches/series
===================================================================
--- desktop/branches/experimental/xfce4-panel/debian/patches/series	                        (rev 0)
+++ desktop/branches/experimental/xfce4-panel/debian/patches/series	2010-11-09 12:11:49 UTC (rev 4556)
@@ -0,0 +1,3 @@
+01_fix-crash-tasklist-group.patch
+02_drop-automatic-grouping.patch
+10_ignore-translation-quilt.patch




More information about the Pkg-xfce-commits mailing list