r13325 - in /desktop/unstable/gtk+2.0/debian: changelog patches/031_gtksearchenginetracker_fixes.patch patches/033_treeview_resizing.patch patches/series

joss at users.alioth.debian.org joss at users.alioth.debian.org
Wed Oct 31 18:49:00 UTC 2007


Author: joss
Date: Wed Oct 31 18:49:00 2007
New Revision: 13325

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=13325
Log:
* Remove the --enable-explicit-deps flag. Closes: #343711, thanks Tom
  Parker. If some other packages still rely on having explicit X11
* 033_treeview_resizing.patch: updated patch from Kristian Rietveld.
* 031_gtksearchenginetracker_fixes.patch: added back, only the name 
  change was fixed upstream.

Added:
    desktop/unstable/gtk+2.0/debian/patches/031_gtksearchenginetracker_fixes.patch
Modified:
    desktop/unstable/gtk+2.0/debian/changelog
    desktop/unstable/gtk+2.0/debian/patches/033_treeview_resizing.patch
    desktop/unstable/gtk+2.0/debian/patches/series

Modified: desktop/unstable/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/changelog?rev=13325&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/changelog (original)
+++ desktop/unstable/gtk+2.0/debian/changelog Wed Oct 31 18:49:00 2007
@@ -1,11 +1,14 @@
 gtk+2.0 (2.12.1-2) UNRELEASED; urgency=low
 
   * Stop suggesting gtk-engines-pixmap.
-  * Remove the --enable-explicit-deps flag. Closes: #343711, thanks Tom 
-    Parker. If some other packages still rely on having explicit X11 
+  * Remove the --enable-explicit-deps flag. Closes: #343711, thanks Tom
+    Parker. If some other packages still rely on having explicit X11
     dependencies, they are buggy and need to be fixed anyway.
-
- -- Josselin Mouette <joss at debian.org>  Fri, 26 Oct 2007 13:17:12 +0200
+  * 033_treeview_resizing.patch: updated patch from Kristian Rietveld.
+  * 031_gtksearchenginetracker_fixes.patch: added back, only the name 
+    change was fixed upstream.
+
+ -- Josselin Mouette <joss at debian.org>  Wed, 31 Oct 2007 19:39:47 +0100
 
 gtk+2.0 (2.12.1-1) unstable; urgency=low
 

Added: desktop/unstable/gtk+2.0/debian/patches/031_gtksearchenginetracker_fixes.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/patches/031_gtksearchenginetracker_fixes.patch?rev=13325&op=file
==============================================================================
--- desktop/unstable/gtk+2.0/debian/patches/031_gtksearchenginetracker_fixes.patch (added)
+++ desktop/unstable/gtk+2.0/debian/patches/031_gtksearchenginetracker_fixes.patch Wed Oct 31 18:49:00 2007
@@ -1,0 +1,47 @@
+Index: gtk+-2.12.1/gtk/gtksearchenginetracker.c
+===================================================================
+--- gtk+-2.12.1.orig/gtk/gtksearchenginetracker.c	2007-10-16 15:20:38.000000000 +0200
++++ gtk+-2.12.1/gtk/gtksearchenginetracker.c	2007-10-31 19:38:20.770226213 +0100
+@@ -35,6 +35,7 @@
+ 
+ static TrackerClient * (*tracker_connect) (gboolean enable_warnings) = NULL;
+ static void	       (*tracker_disconnect) (TrackerClient *client) = NULL;
++static int             (*tracker_get_version) (TrackerClient *client, GError **error) = NULL;
+ static void            (*tracker_cancel_last_call) (TrackerClient *client) = NULL;
+ 
+ static void (*tracker_search_metadata_by_text_async) (TrackerClient *client, 
+@@ -56,6 +57,7 @@
+ #define MAP(a) { #a, (gpointer *)&a }
+   MAP (tracker_connect),
+   MAP (tracker_disconnect),
++  MAP (tracker_get_version),
+   MAP (tracker_cancel_last_call),
+   MAP (tracker_search_metadata_by_text_async),
+   MAP (tracker_search_metadata_by_text_and_location_async),
+@@ -285,6 +287,7 @@
+ {
+   GtkSearchEngineTracker *engine;
+   TrackerClient *tracker_client;
++  GError *err = NULL;
+ 
+   open_libtracker ();
+ 
+@@ -296,6 +299,18 @@
+   if (!tracker_client)
+     return NULL;
+ 
++  if (!tracker_get_version)
++    return NULL;
++
++  tracker_get_version (tracker_client, &err);
++
++  if (err != NULL)
++    {
++      g_error_free (err);
++      tracker_disconnect (tracker_client);
++      return NULL;
++    }
++
+   engine = g_object_new (GTK_TYPE_SEARCH_ENGINE_TRACKER, NULL);
+ 
+   engine->priv->client = tracker_client;

Modified: desktop/unstable/gtk+2.0/debian/patches/033_treeview_resizing.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/patches/033_treeview_resizing.patch?rev=13325&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/patches/033_treeview_resizing.patch (original)
+++ desktop/unstable/gtk+2.0/debian/patches/033_treeview_resizing.patch Wed Oct 31 18:49:00 2007
@@ -1,22 +1,22 @@
---- gtk+2.0-2.12.1.orig/gtk/gtktreeviewcolumn.c	2007-10-16 15:20:39.000000000 +0200
-+++ gtk+2.0-2.12.1/gtk/gtktreeviewcolumn.c	2007-10-18 16:30:17.000000000 +0200
-@@ -2142,6 +2142,7 @@
-       tree_column->tree_view != NULL &&
-       GTK_WIDGET_REALIZED (tree_column->tree_view))
-     {
-+      tree_column->use_resized_width = FALSE;
-       gtk_widget_queue_resize (tree_column->tree_view);
-     }
- 
---- gtk+2.0-2.12.1.orig/gtk/gtktreeview.c	2007-10-16 15:20:39.000000000 +0200
-+++ gtk+2.0-2.12.1/gtk/gtktreeview.c	2007-10-18 16:30:17.000000000 +0200
-@@ -2159,18 +2159,20 @@
+Index: gtk+-2.12.1/gtk/gtktreeview.c
+===================================================================
+--- gtk+-2.12.1.orig/gtk/gtktreeview.c	2007-10-16 15:20:39.000000000 +0200
++++ gtk+-2.12.1/gtk/gtktreeview.c	2007-10-31 19:32:10.309114837 +0100
+@@ -1993,6 +1993,7 @@
+ 
+   tree_view->priv->prev_width = tree_view->priv->width;  
+   tree_view->priv->width = 0;
++
+   /* keep this in sync with size_allocate below */
+   for (list = tree_view->priv->columns, i = 0; list; list = list->next, i++)
+     {
+@@ -2159,18 +2160,20 @@
  
  /* GtkWidget::size_allocate helper */
  static void
 -gtk_tree_view_size_allocate_columns (GtkWidget *widget)
 +gtk_tree_view_size_allocate_columns (GtkWidget *widget,
-+				     gboolean   width_changed)
++				     gboolean  *width_changed)
  {
    GtkTreeView *tree_view;
    GList *list, *first_column, *last_column;
@@ -33,7 +33,7 @@
    
    tree_view = GTK_TREE_VIEW (widget);
  
-@@ -2205,12 +2207,38 @@
+@@ -2205,12 +2208,38 @@
  	number_of_expand_columns++;
      }
  
@@ -42,7 +42,7 @@
 +   * the number of expand columns are if there are no expand
 +   * columns.
 +   */
-+  update_expand = width_changed ||
++  update_expand = *width_changed ||
 +                  number_of_expand_columns != tree_view->priv->last_number_of_expand_columns ||
 +		  number_of_expand_columns == 0;
 +
@@ -73,44 +73,103 @@
    for (list = (rtl ? last_column : first_column); 
         list != (rtl ? first_column->prev : last_column->next);
         list = (rtl ? list->prev : list->next)) 
-@@ -2265,6 +2293,10 @@
- 	{
+@@ -2266,6 +2295,12 @@
  	  column->width += extra;
  	}
-+      else if (extra_for_last > 0 && list == last_column)
+ 
++      /* In addition to expand, the last column can get even more
++       * extra space so all available space is filled up.
++       */
++      if (extra_for_last > 0 && list == last_column)
++	column->width += extra_for_last;
++
+       g_object_notify (G_OBJECT (column), "width");
+ 
+       allocation.width = column->width;
+@@ -2283,6 +2318,14 @@
+                                 TREE_VIEW_DRAG_WIDTH, allocation.height);
+     }
+ 
++  /* We change the width here.  The user has been dragging columns,
++   * and we do need more width than allocated to properly display.
++   * The scrolled window should handle this, if the application
++   * doesn't have one, the tree view can't fit.
++   */
++  tree_view->priv->width = width;
++  *width_changed = TRUE;
++
+   if (column_changed)
+     gtk_widget_queue_draw (GTK_WIDGET (tree_view));
+ }
+@@ -2323,6 +2366,7 @@
+       gtk_widget_size_allocate (child->widget, &allocation);
+     }
+ 
++  gtk_tree_view_size_allocate_columns (widget, &width_changed);
+ 
+   tree_view->priv->hadjustment->page_size = allocation->width;
+   tree_view->priv->hadjustment->page_increment = allocation->width * 0.9;
+@@ -2331,28 +2375,30 @@
+   tree_view->priv->hadjustment->upper = MAX (tree_view->priv->hadjustment->page_size, tree_view->priv->width);
+ 
+   if (gtk_widget_get_direction(widget) == GTK_TEXT_DIR_RTL)   
+-     {
++    {
+       if (allocation->width < tree_view->priv->width)
+-         {
+-         if (tree_view->priv->init_hadjust_value)
+-           {
+-           tree_view->priv->hadjustment->value = MAX (tree_view->priv->width - allocation->width, 0);
+-           tree_view->priv->init_hadjust_value = FALSE;
+-           }
+-         else if(allocation->width != old_width)
+-           tree_view->priv->hadjustment->value = CLAMP(tree_view->priv->hadjustment->value - allocation->width + old_width, 0, tree_view->priv->width - allocation->width);
+-         else
+-           tree_view->priv->hadjustment->value = CLAMP(tree_view->priv->width - (tree_view->priv->prev_width - tree_view->priv->hadjustment->value), 0, tree_view->priv->width - allocation->width);
+-         }
+-      else
+-         {
+-         tree_view->priv->hadjustment->value = 0;
+-         tree_view->priv->init_hadjust_value = TRUE;
+-         }
+-     }
 +        {
-+	  column->width += extra_for_last;
++	  if (tree_view->priv->init_hadjust_value)
++	    {
++	      tree_view->priv->hadjustment->value = MAX (tree_view->priv->width - allocation->width, 0);
++	      tree_view->priv->init_hadjust_value = FALSE;
++	    }
++	  else if (allocation->width != old_width)
++	    {
++	      tree_view->priv->hadjustment->value = CLAMP (tree_view->priv->hadjustment->value - allocation->width + old_width, 0, tree_view->priv->width - allocation->width);
++	    }
++	  else
++	    tree_view->priv->hadjustment->value = CLAMP (tree_view->priv->width - (tree_view->priv->prev_width - tree_view->priv->hadjustment->value), 0, tree_view->priv->width - allocation->width);
 +	}
- 
-       g_object_notify (G_OBJECT (column), "width");
- 
-@@ -2299,13 +2331,13 @@
- 
-   g_return_if_fail (GTK_IS_TREE_VIEW (widget));
- 
--  if (allocation->width != widget->allocation.width)
--    width_changed = TRUE;
--  
-   widget->allocation = *allocation;
- 
-   tree_view = GTK_TREE_VIEW (widget);
- 
-+  if (tree_view->priv->prev_width != widget->allocation.width)
-+    width_changed = TRUE;
-+
-   tmp_list = tree_view->priv->children;
- 
-   while (tmp_list)
-@@ -2392,7 +2424,7 @@
++      else
++        {
++	  tree_view->priv->hadjustment->value = 0;
++	  tree_view->priv->init_hadjust_value = TRUE;
++	}
++    }
+   else
+-     if (tree_view->priv->hadjustment->value + allocation->width > tree_view->priv->width)
+-        tree_view->priv->hadjustment->value = MAX (tree_view->priv->width - allocation->width, 0);
++    if (tree_view->priv->hadjustment->value + allocation->width > tree_view->priv->width)
++      tree_view->priv->hadjustment->value = MAX (tree_view->priv->width - allocation->width, 0);
+ 
+   gtk_adjustment_changed (tree_view->priv->hadjustment);
+ 
+@@ -2392,8 +2438,6 @@
  			      allocation->height - TREE_VIEW_HEADER_HEIGHT (tree_view));
      }
  
 -  gtk_tree_view_size_allocate_columns (widget);
-+  gtk_tree_view_size_allocate_columns (widget, width_changed);
- 
+-
    if (tree_view->priv->tree == NULL)
      invalidate_empty_focus (tree_view);
-@@ -2837,7 +2869,7 @@
+ 
+@@ -2837,7 +2881,7 @@
  
  	  gtk_grab_add (widget);
  	  GTK_TREE_VIEW_SET_FLAG (tree_view, GTK_TREE_VIEW_IN_COLUMN_RESIZE);
@@ -119,7 +178,7 @@
  
  	  /* block attached dnd signal handler */
  	  drag_data = g_object_get_data (G_OBJECT (widget), "gtk-site-data");
-@@ -3546,6 +3578,8 @@
+@@ -3546,6 +3590,8 @@
      {
        column->use_resized_width = TRUE;
        column->resized_width = new_width;
@@ -128,7 +187,7 @@
        gtk_widget_queue_resize (widget);
      }
  
-@@ -11479,7 +11513,7 @@
+@@ -11479,7 +11525,7 @@
    if (GTK_WIDGET_REALIZED (tree_view))
      {
        gtk_widget_queue_resize (GTK_WIDGET (tree_view));
@@ -137,16 +196,30 @@
      }
  
    g_signal_emit (tree_view, tree_view_signals[COLUMNS_CHANGED], 0);
---- gtk+2.0-2.12.1.orig/gtk/gtktreeprivate.h	2007-10-16 15:20:39.000000000 +0200
-+++ gtk+2.0-2.12.1/gtk/gtktreeprivate.h	2007-10-18 16:30:17.000000000 +0200
-@@ -265,6 +265,10 @@
-   gboolean tree_lines_enabled;
+Index: gtk+-2.12.1/gtk/gtktreeviewcolumn.c
+===================================================================
+--- gtk+-2.12.1.orig/gtk/gtktreeviewcolumn.c	2007-10-16 15:20:39.000000000 +0200
++++ gtk+-2.12.1/gtk/gtktreeviewcolumn.c	2007-10-31 19:32:10.309114837 +0100
+@@ -2142,6 +2142,7 @@
+       tree_column->tree_view != NULL &&
+       GTK_WIDGET_REALIZED (tree_column->tree_view))
+     {
++      tree_column->use_resized_width = FALSE;
+       gtk_widget_queue_resize (tree_column->tree_view);
+     }
+ 
+Index: gtk+-2.12.1/gtk/gtktreeprivate.h
+===================================================================
+--- gtk+-2.12.1.orig/gtk/gtktreeprivate.h	2007-10-16 15:20:39.000000000 +0200
++++ gtk+-2.12.1/gtk/gtktreeprivate.h	2007-10-31 19:32:10.309114837 +0100
+@@ -266,6 +266,10 @@
    GdkGC *tree_line_gc;
  
+   gint tooltip_column;
++
 +  gint last_extra_space;
 +  gint last_extra_space_per_column;
 +  gint last_number_of_expand_columns;
-+
-   gint tooltip_column;
  };
  
+ #ifdef __GNUC__

Modified: desktop/unstable/gtk+2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/patches/series?rev=13325&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/patches/series (original)
+++ desktop/unstable/gtk+2.0/debian/patches/series Wed Oct 31 18:49:00 2007
@@ -10,6 +10,7 @@
 020_immodules-files-d.patch
 021_loader-files-d.patch
 030_gtkentry_password-char-circle.patch
+031_gtksearchenginetracker_fixes.patch
 033_treeview_resizing.patch
 040_filechooser_single-click.patch
 041_ia32-libs.patch




More information about the pkg-gnome-commits mailing list