rpms/gtk2/devel dont-use-deprecated-api.patch, 1.2, 1.3 gtk2.spec, 1.378, 1.379

Matthias Clasen mclasen at fedoraproject.org
Tue Jun 16 16:26:16 UTC 2009


Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27894

Modified Files:
	dont-use-deprecated-api.patch gtk2.spec 
Log Message:
more of the saem


dont-use-deprecated-api.patch:

Index: dont-use-deprecated-api.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/dont-use-deprecated-api.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- dont-use-deprecated-api.patch	16 Jun 2009 15:51:09 -0000	1.2
+++ dont-use-deprecated-api.patch	16 Jun 2009 16:26:11 -0000	1.3
@@ -1,5 +1,5 @@
 diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
-index 555418a..30545f6 100644
+index 555418a..2a84a48 100644
 --- a/gtk/gtkcombobox.c
 +++ b/gtk/gtkcombobox.c
 @@ -1695,7 +1695,7 @@ cell_view_is_sensitive (GtkCellView *cell_view)
@@ -11,8 +11,26 @@ index 555418a..30545f6 100644
  
    sensitive = FALSE;
    for (list = cells; list; list = list->next)
+@@ -1732,7 +1732,7 @@ tree_column_row_is_sensitive (GtkComboBox *combo_box,
+ 					   priv->model,
+ 					   iter, FALSE, FALSE);
+ 
+-  cells = gtk_tree_view_column_get_cell_renderers (priv->column);
++  cells = gtk_cell_layout_get_cells (GTK_CELL_LAYOUT (priv->column));
+ 
+   sensitive = FALSE;
+   for (list = cells; list; list = list->next)
+@@ -4097,7 +4097,7 @@ gtk_combo_box_list_select_func (GtkTreeSelection *selection,
+       gtk_tree_view_column_cell_set_cell_data (column, model, &iter,
+ 					       FALSE, FALSE);
+ 
+-      cell = cells = gtk_tree_view_column_get_cell_renderers (column);
++      cell = cells = gtk_cell_layout_get_cells (GTK_CELL_LAYOUT (column));
+       while (cell)
+         {
+ 	  g_object_get (cell->data,
 diff --git a/gtk/gtkentrycompletion.c b/gtk/gtkentrycompletion.c
-index e2e0142..cb02c5a 100644
+index e2e0142..a3a01be 100644
 --- a/gtk/gtkentrycompletion.c
 +++ b/gtk/gtkentrycompletion.c
 @@ -758,7 +758,7 @@ gtk_entry_completion_get_cells (GtkCellLayout *cell_layout)
@@ -24,6 +42,15 @@ index e2e0142..cb02c5a 100644
  }
  
  /* all those callbacks */
+@@ -1486,7 +1486,7 @@ _gtk_entry_completion_popup (GtkEntryCompletion *completion)
+   completion->priv->ignore_enter = TRUE;
+     
+   column = gtk_tree_view_get_column (GTK_TREE_VIEW (completion->priv->action_view), 0);
+-  renderers = gtk_tree_view_column_get_cell_renderers (column);
++  renderers = gtk_cell_layout_get_cells (GTK_CELL_LAYOUT (column));
+   gtk_widget_ensure_style (completion->priv->tree_view);
+   g_object_set (GTK_CELL_RENDERER (renderers->data), "cell-background-gdk",
+                 &completion->priv->tree_view->style->bg[GTK_STATE_NORMAL],
 diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
 index 22836c1..7dc9867 100644
 --- a/gtk/gtkfilechooserdefault.c


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.378
retrieving revision 1.379
diff -u -p -r1.378 -r1.379
--- gtk2.spec	16 Jun 2009 15:30:56 -0000	1.378
+++ gtk2.spec	16 Jun 2009 16:26:11 -0000	1.379
@@ -17,7 +17,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.17/gtk+-%{version}.tar.bz2
@@ -373,7 +373,7 @@ fi
 
 
 %changelog
-* Tue Jun 16 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.2-2
+* Tue Jun 16 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.2-3
 - Fix an entry completion crash
 
 * Mon Jun 15 2009 Matthias Clasen <mclasen at redhat.com> - 2.17.2-1




More information about the fedora-extras-commits mailing list