[arch-commits] Commit in gtk2/repos/extra-x86_64 (9 files)
Jan de Groot
jgc at archlinux.org
Sun Apr 20 11:51:48 UTC 2008
Date: Sunday, April 20, 2008 @ 07:51:48
Author: jgc
Revision: 496
Remove old patches
Deleted:
gtk2/repos/extra-x86_64/double-free.patch
gtk2/repos/extra-x86_64/gdkscreen-check.patch
gtk2/repos/extra-x86_64/gtk2-2.10.12-filechooser-sizing.patch
gtk2/repos/extra-x86_64/gtkiconcache-disable-debug.patch
gtk2/repos/extra-x86_64/gtksearchenginetracker-update-modulename.patch
gtk2/repos/extra-x86_64/gtkselection-dontcrash-on-null.patch
gtk2/repos/extra-x86_64/scale-button-grab.patch
gtk2/repos/extra-x86_64/simple-search-crash.patch
gtk2/repos/extra-x86_64/swt-tooltips.patch
------------------------------------------------+
double-free.patch | 11
gdkscreen-check.patch | 11
gtk2-2.10.12-filechooser-sizing.patch | 547 -----------------------
gtkiconcache-disable-debug.patch | 27 -
gtksearchenginetracker-update-modulename.patch | 21
gtkselection-dontcrash-on-null.patch | 43 -
scale-button-grab.patch | 42 -
simple-search-crash.patch | 84 ---
swt-tooltips.patch | 13
9 files changed, 799 deletions(-)
Deleted: double-free.patch
===================================================================
--- double-free.patch 2008-04-20 11:51:30 UTC (rev 495)
+++ double-free.patch 2008-04-20 11:51:48 UTC (rev 496)
@@ -1,11 +0,0 @@
-diff -up gtk+-2.12.0/gtk/updateiconcache.c.double-free gtk+-2.12.0/gtk/updateiconcache.c
---- gtk+-2.12.0/gtk/updateiconcache.c.double-free 2007-10-11 15:33:11.000000000 -0400
-+++ gtk+-2.12.0/gtk/updateiconcache.c 2007-10-11 15:33:38.000000000 -0400
-@@ -219,7 +219,6 @@ foreach_remove_func (gpointer key, gpoin
- {
- /* just a .icon file, throw away */
- g_free (key);
-- free_icon_data (image->icon_data);
- g_free (image);
-
- return TRUE;
Deleted: gdkscreen-check.patch
===================================================================
--- gdkscreen-check.patch 2008-04-20 11:51:30 UTC (rev 495)
+++ gdkscreen-check.patch 2008-04-20 11:51:48 UTC (rev 496)
@@ -1,11 +0,0 @@
---- gtk+-2.11.6/gdk/gdkscreen.c.orig 2007-08-19 12:26:37.000000000 +0200
-+++ gtk+-2.11.6/gdk/gdkscreen.c 2007-08-19 12:27:08.000000000 +0200
-@@ -417,6 +417,8 @@
- const cairo_font_options_t *
- gdk_screen_get_font_options (GdkScreen *screen)
- {
-+ if (screen == NULL)
-+ return NULL;
- g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
-
- return screen->font_options;
Deleted: gtk2-2.10.12-filechooser-sizing.patch
===================================================================
--- gtk2-2.10.12-filechooser-sizing.patch 2008-04-20 11:51:30 UTC (rev 495)
+++ gtk2-2.10.12-filechooser-sizing.patch 2008-04-20 11:51:48 UTC (rev 496)
@@ -1,547 +0,0 @@
-Index: gtk/gtkfilechooserembed.c
-===================================================================
---- gtk/gtkfilechooserembed.c (revision 17866)
-+++ gtk/gtkfilechooserembed.c (revision 17867)
-@@ -28,9 +28,7 @@
- static void delegate_get_default_size (GtkFileChooserEmbed *chooser_embed,
- gint *default_width,
- gint *default_height);
--static void delegate_get_resizable_hints (GtkFileChooserEmbed *chooser_embed,
-- gboolean *resize_horizontally,
-- gboolean *resize_vertically);
-+static gboolean delegate_get_resizable (GtkFileChooserEmbed *chooser_embed);
- static gboolean delegate_should_respond (GtkFileChooserEmbed *chooser_embed);
- static void delegate_initial_focus (GtkFileChooserEmbed *chooser_embed);
- static void delegate_default_size_changed (GtkFileChooserEmbed *chooser_embed,
-@@ -57,7 +55,7 @@
- _gtk_file_chooser_embed_delegate_iface_init (GtkFileChooserEmbedIface *iface)
- {
- iface->get_default_size = delegate_get_default_size;
-- iface->get_resizable_hints = delegate_get_resizable_hints;
-+ iface->get_resizable = delegate_get_resizable;
- iface->should_respond = delegate_should_respond;
- iface->initial_focus = delegate_initial_focus;
- }
-@@ -96,13 +94,11 @@
- {
- _gtk_file_chooser_embed_get_default_size (get_delegate (chooser_embed), default_width, default_height);
- }
--
--static void
--delegate_get_resizable_hints (GtkFileChooserEmbed *chooser_embed,
-- gboolean *resize_horizontally,
-- gboolean *resize_vertically)
-+
-+static gboolean
-+delegate_get_resizable (GtkFileChooserEmbed *chooser_embed)
- {
-- _gtk_file_chooser_embed_get_resizable_hints (get_delegate (chooser_embed), resize_horizontally, resize_vertically);
-+ return _gtk_file_chooser_embed_get_resizable (get_delegate (chooser_embed));
- }
-
- static gboolean
-@@ -208,14 +204,10 @@
- GTK_FILE_CHOOSER_EMBED_GET_IFACE (chooser_embed)->initial_focus (chooser_embed);
- }
-
--void
--_gtk_file_chooser_embed_get_resizable_hints (GtkFileChooserEmbed *chooser_embed,
-- gboolean *resize_horizontally,
-- gboolean *resize_vertically)
-+gboolean
-+_gtk_file_chooser_embed_get_resizable (GtkFileChooserEmbed *chooser_embed)
- {
-- g_return_if_fail (GTK_IS_FILE_CHOOSER_EMBED (chooser_embed));
-- g_return_if_fail (resize_horizontally != NULL);
-- g_return_if_fail (resize_vertically != NULL);
-+ g_return_val_if_fail (GTK_IS_FILE_CHOOSER_EMBED (chooser_embed), FALSE);
-
-- GTK_FILE_CHOOSER_EMBED_GET_IFACE (chooser_embed)->get_resizable_hints (chooser_embed, resize_horizontally, resize_vertically);
-+ return GTK_FILE_CHOOSER_EMBED_GET_IFACE (chooser_embed)->get_resizable (chooser_embed);
- }
-Index: gtk/gtkfilechooserembed.h
-===================================================================
---- gtk/gtkfilechooserembed.h (revision 17866)
-+++ gtk/gtkfilechooserembed.h (revision 17867)
-@@ -43,9 +43,7 @@
- void (*get_default_size) (GtkFileChooserEmbed *chooser_embed,
- gint *default_width,
- gint *default_height);
-- void (*get_resizable_hints) (GtkFileChooserEmbed *chooser_embed,
-- gboolean *resize_horizontally,
-- gboolean *resize_vertically);
-+ gboolean (*get_resizable) (GtkFileChooserEmbed *chooser_embed);
-
- gboolean (*should_respond) (GtkFileChooserEmbed *chooser_embed);
-
-@@ -61,10 +59,7 @@
- void _gtk_file_chooser_embed_get_default_size (GtkFileChooserEmbed *chooser_embed,
- gint *default_width,
- gint *default_height);
--void _gtk_file_chooser_embed_get_resizable_hints (GtkFileChooserEmbed *chooser_embed,
-- gboolean *resize_horizontally,
-- gboolean *resize_vertically);
--
-+gboolean _gtk_file_chooser_embed_get_resizable (GtkFileChooserEmbed *chooser_embed);
- gboolean _gtk_file_chooser_embed_should_respond (GtkFileChooserEmbed *chooser_embed);
-
- void _gtk_file_chooser_embed_initial_focus (GtkFileChooserEmbed *chooser_embed);
-Index: gtk/gtkfilechooserdialog.c
-===================================================================
---- gtk/gtkfilechooserdialog.c (revision 17866)
-+++ gtk/gtkfilechooserdialog.c (revision 17867)
-@@ -87,10 +87,6 @@
- GTK_TYPE_FILE_CHOOSER_DIALOG,
- GtkFileChooserDialogPrivate);
- dialog->priv = priv;
-- dialog->priv->default_width = -1;
-- dialog->priv->default_height = -1;
-- dialog->priv->resize_horizontally = TRUE;
-- dialog->priv->resize_vertically = TRUE;
- dialog->priv->response_requested = FALSE;
-
- gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
-@@ -151,25 +147,6 @@
- }
-
- static void
--file_chooser_widget_update_hints (GtkFileChooserDialog *dialog,
-- gint width)
--{
-- GtkFileChooserDialogPrivate *priv;
-- GdkGeometry geometry;
--
-- priv = GTK_FILE_CHOOSER_DIALOG_GET_PRIVATE (dialog);
--
-- geometry.min_width = (!priv->resize_horizontally ? width : -1);
-- geometry.min_height = -1;
-- geometry.max_width = (priv->resize_horizontally?G_MAXSHORT:-1);
-- geometry.max_height = (priv->resize_vertically?G_MAXSHORT:-1);
--
-- gtk_window_set_geometry_hints (GTK_WINDOW (dialog), NULL,
-- &geometry,
-- GDK_HINT_MIN_SIZE | GDK_HINT_MAX_SIZE);
--}
--
--static void
- clamp_to_screen (GtkWidget *widget,
- gint *width,
- gint *height)
-@@ -193,131 +170,57 @@
- }
-
- static void
--file_chooser_widget_default_realized_size_changed (GtkWidget *widget,
-- GtkFileChooserDialog *dialog)
-+file_chooser_widget_default_size_changed (GtkWidget *widget,
-+ GtkFileChooserDialog *dialog)
- {
- GtkFileChooserDialogPrivate *priv;
-- gint width;
-- gint height;
-+ gint width, height;
- gint default_width, default_height;
-- GtkRequisition req;
-- gboolean resize_horizontally;
-- gboolean resize_vertically;
-- gboolean update_hints;
-- gint dx = 0, dy = 0;
-- gint cur_width, cur_height;
-+ GtkRequisition req, widget_req;
-+ gboolean resizable;
-
- priv = GTK_FILE_CHOOSER_DIALOG_GET_PRIVATE (dialog);
-
-- /* Force a size request of everything before we start. This will make sure
-- * that widget->requisition is meaningful. */
-- gtk_widget_size_request (GTK_WIDGET (dialog), &req);
-- gtk_window_get_size (GTK_WINDOW (dialog), &cur_width, &cur_height);
-- width = GTK_WIDGET (dialog)->requisition.width - priv->widget->requisition.width;
-- height = GTK_WIDGET (dialog)->requisition.height - priv->widget->requisition.height;
-- _gtk_file_chooser_embed_get_default_size (GTK_FILE_CHOOSER_EMBED (priv->widget),
-- &default_width, &default_height);
-+ /* Unset any previously set size */
-+ gtk_widget_set_size_request (GTK_WIDGET (dialog), -1, -1);
-
-- /* Ideal target size modulo any resizing */
-- width = default_width + width;
-- height = default_height + height;
--
-- /* Now, we test for resizability */
-- update_hints = FALSE;
-- _gtk_file_chooser_embed_get_resizable_hints (GTK_FILE_CHOOSER_EMBED (priv->widget),
-- &resize_horizontally,
-- &resize_vertically);
-- resize_vertically = (!! resize_vertically); /* normalize */
-- resize_horizontally = (!! resize_horizontally);
--
-- if (resize_horizontally && priv->resize_horizontally)
-+ if (GTK_WIDGET_DRAWABLE (widget))
- {
-- dx = default_width - priv->default_width;
-- priv->default_width = default_width;
-- }
-- else if (resize_horizontally && ! priv->resize_horizontally)
-- {
-- /* We restore to the ideal size + any change in default_size (which is not
-- * expected). It would be nicer to store the older size to restore to in
-- * the future. */
-- dx = default_width - priv->default_width;
-- dx += width - cur_width;
-- priv->default_width = default_width;
-- update_hints = TRUE;
-- }
-- else
-- {
-- update_hints = TRUE;
-- }
-+ /* Force a size request of everything before we start. This will make sure
-+ * that widget->requisition is meaningful. */
-+ gtk_widget_size_request (GTK_WIDGET (dialog), &req);
-+ gtk_widget_size_request (widget, &widget_req);
-
-- if (resize_vertically && priv->resize_vertically)
-- {
-- dy = default_height - priv->default_height;
-- priv->default_height = default_height;
-+ width = req.width - widget_req.width;
-+ height = req.height - widget_req.height;
- }
-- else if (resize_vertically && ! priv->resize_vertically)
-- {
-- dy = default_height - priv->default_height;
-- dy += height - cur_height;
-- priv->default_height = default_height;
-- update_hints = TRUE;
-- }
- else
- {
-- update_hints = TRUE;
-+ width = GTK_WIDGET (dialog)->allocation.width - widget->allocation.width;
-+ height = GTK_WIDGET (dialog)->allocation.height - widget->allocation.height;
- }
-
-- priv->resize_horizontally = resize_horizontally;
-- priv->resize_vertically = resize_vertically;
--
-- if (dx != 0 || dy != 0)
-- {
-- gint new_width = cur_width + dx;
-- gint new_height = cur_height + dy;
--
-- clamp_to_screen (GTK_WIDGET (dialog), &new_width, &new_height);
--
-- gtk_window_resize (GTK_WINDOW (dialog), new_width, new_height);
-- }
--
-- /* Only store the size if we can resize in that direction. */
-- if (update_hints)
-- file_chooser_widget_update_hints (dialog, width);
--}
--
--static void
--file_chooser_widget_default_unrealized_size_changed (GtkWidget *widget,
-- GtkFileChooserDialog *dialog)
--{
-- GtkFileChooserDialogPrivate *priv;
-- GtkRequisition req;
-- gint width, height;
--
-- priv = GTK_FILE_CHOOSER_DIALOG_GET_PRIVATE (dialog);
-- gtk_widget_size_request (GTK_WIDGET (dialog), &req);
--
-- _gtk_file_chooser_embed_get_resizable_hints (GTK_FILE_CHOOSER_EMBED (priv->widget),
-- &(priv->resize_horizontally),
-- &(priv->resize_vertically));
-+ resizable = _gtk_file_chooser_embed_get_resizable (GTK_FILE_CHOOSER_EMBED (priv->widget));
- _gtk_file_chooser_embed_get_default_size (GTK_FILE_CHOOSER_EMBED (priv->widget),
-- &(priv->default_width), &(priv->default_height));
--
-- /* Determine how much space the rest of the dialog uses compared to priv->widget */
-- width = priv->default_width + GTK_WIDGET (dialog)->requisition.width - priv->widget->requisition.width;
-- height = priv->default_height + GTK_WIDGET (dialog)->requisition.height - priv->widget->requisition.height;
-+ &default_width, &default_height);
-
-- gtk_window_set_default_size (GTK_WINDOW (dialog), width, height);
-- file_chooser_widget_update_hints (dialog, width);
--}
-+ /* Ideal target size plus any extra size */
-+ width = default_width + width + (2 * GTK_CONTAINER (dialog)->border_width);
-+ height = default_height + height + (2 * GTK_CONTAINER (dialog)->border_width);
-
--static void
--file_chooser_widget_default_size_changed (GtkWidget *widget,
-- GtkFileChooserDialog *dialog)
--{
- if (GTK_WIDGET_REALIZED (dialog))
-- file_chooser_widget_default_realized_size_changed (widget, dialog);
-+ clamp_to_screen (GTK_WIDGET (dialog), &width, &height);
-+
-+ if (resizable)
-+ {
-+ gtk_window_set_resizable (GTK_WINDOW (dialog), resizable);
-+ gtk_window_resize (GTK_WINDOW (dialog), width, height);
-+ }
- else
-- file_chooser_widget_default_unrealized_size_changed (widget, dialog);
-+ {
-+ gtk_widget_set_size_request (GTK_WIDGET (dialog), width, -1);
-+ gtk_window_set_resizable (GTK_WINDOW (dialog), resizable);
-+ }
- }
-
- static void
-@@ -487,6 +390,7 @@
- if (!GTK_WIDGET_MAPPED (priv->widget))
- gtk_widget_map (priv->widget);
-
-+ file_chooser_widget_default_size_changed (priv->widget, dialog);
- _gtk_file_chooser_embed_initial_focus (GTK_FILE_CHOOSER_EMBED (priv->widget));
-
- GTK_WIDGET_CLASS (gtk_file_chooser_dialog_parent_class)->map (widget);
-Index: gtk/gtkfilechooserdefault.c
-===================================================================
---- gtk/gtkfilechooserdefault.c (revision 17866)
-+++ gtk/gtkfilechooserdefault.c (revision 17867)
-@@ -272,6 +272,8 @@
- GtkStyle *previous_style);
- static void gtk_file_chooser_default_screen_changed (GtkWidget *widget,
- GdkScreen *previous_screen);
-+static void gtk_file_chooser_default_size_allocate (GtkWidget *widget,
-+ GtkAllocation *allocation);
-
- static gboolean gtk_file_chooser_default_set_current_folder (GtkFileChooser *chooser,
- const GtkFilePath *path,
-@@ -310,9 +312,7 @@
- static void gtk_file_chooser_default_get_default_size (GtkFileChooserEmbed *chooser_embed,
- gint *default_width,
- gint *default_height);
--static void gtk_file_chooser_default_get_resizable_hints (GtkFileChooserEmbed *chooser_embed,
-- gboolean *resize_horizontally,
-- gboolean *resize_vertically);
-+static gboolean gtk_file_chooser_default_get_resizable (GtkFileChooserEmbed *chooser_embed);
- static gboolean gtk_file_chooser_default_should_respond (GtkFileChooserEmbed *chooser_embed);
- static void gtk_file_chooser_default_initial_focus (GtkFileChooserEmbed *chooser_embed);
-
-@@ -423,8 +423,8 @@
- static void location_button_toggled_cb (GtkToggleButton *toggle,
- GtkFileChooserDefault *impl);
- static void location_switch_to_path_bar (GtkFileChooserDefault *impl);
-+static void settings_load (GtkFileChooserDefault *impl);
-
--
-
-
- /* Drag and drop interface declarations */
-@@ -485,6 +485,7 @@
- widget_class->hierarchy_changed = gtk_file_chooser_default_hierarchy_changed;
- widget_class->style_set = gtk_file_chooser_default_style_set;
- widget_class->screen_changed = gtk_file_chooser_default_screen_changed;
-+ widget_class->size_allocate = gtk_file_chooser_default_size_allocate;
-
- signals[LOCATION_POPUP] =
- _gtk_binding_signal_new (I_("location-popup"),
-@@ -665,7 +666,7 @@
- gtk_file_chooser_embed_default_iface_init (GtkFileChooserEmbedIface *iface)
- {
- iface->get_default_size = gtk_file_chooser_default_get_default_size;
-- iface->get_resizable_hints = gtk_file_chooser_default_get_resizable_hints;
-+ iface->get_resizable = gtk_file_chooser_default_get_resizable;
- iface->should_respond = gtk_file_chooser_default_should_respond;
- iface->initial_focus = gtk_file_chooser_default_initial_focus;
- }
-@@ -4998,6 +4999,7 @@
- }
- impl->action = action;
- update_appearance (impl);
-+ settings_load (impl);
- }
- }
- break;
-@@ -5419,6 +5421,37 @@
- profile_end ("end", NULL);
- }
-
-+static void
-+gtk_file_chooser_default_size_allocate (GtkWidget *widget,
-+ GtkAllocation *allocation)
-+{
-+ GtkFileChooserDefault *impl;
-+
-+ impl = GTK_FILE_CHOOSER_DEFAULT (widget);
-+
-+ GTK_WIDGET_CLASS (_gtk_file_chooser_default_parent_class)->size_allocate (widget, allocation);
-+
-+ if (!gtk_file_chooser_default_get_resizable (GTK_FILE_CHOOSER_EMBED (impl)))
-+ {
-+ /* The dialog is not resizable, we shouldn't
-+ * trust in the size it has in this stage
-+ */
-+ return;
-+ }
-+
-+ impl->default_width = allocation->width;
-+ impl->default_height = allocation->height;
-+
-+ if (impl->preview_widget_active &&
-+ impl->preview_widget &&
-+ GTK_WIDGET_DRAWABLE (impl->preview_widget))
-+ impl->default_width -= impl->preview_widget->allocation.width + PREVIEW_HBOX_SPACING;
-+
-+ if (impl->extra_widget &&
-+ GTK_WIDGET_DRAWABLE (impl->extra_widget))
-+ impl->default_height -= GTK_BOX (widget)->spacing + impl->extra_widget->allocation.height;
-+}
-+
- static gboolean
- get_is_file_filtered (GtkFileChooserDefault *impl,
- const GtkFilePath *path,
-@@ -7186,49 +7219,35 @@
- gint *height)
- {
- GtkFileChooserDefault *impl;
-- gint default_width, default_height;
- int font_size;
-- GtkRequisition req;
- GdkScreen *screen;
- double resolution;
-
- g_assert (widget->style != NULL);
- impl = GTK_FILE_CHOOSER_DEFAULT (widget);
-
-- screen = gtk_widget_get_screen (widget);
-- if (screen)
-+ if (impl->default_width == 0 &&
-+ impl->default_height == 0)
- {
-- resolution = gdk_screen_get_resolution (screen);
-- if (resolution < 0.0) /* will be -1 if the resolution is not defined in the GdkScreen */
-- resolution = 96.0;
-- }
-- else
-- resolution = 96.0; /* wheeee */
-+ screen = gtk_widget_get_screen (widget);
-+ if (screen)
-+ {
-+ resolution = gdk_screen_get_resolution (screen);
-+ if (resolution < 0.0) /* will be -1 if the resolution is not defined in the GdkScreen */
-+ resolution = 96.0;
-+ }
-+ else
-+ resolution = 96.0; /* wheeee */
-
-- font_size = pango_font_description_get_size (widget->style->font_desc);
-- font_size = PANGO_PIXELS (font_size) * resolution / 72.0;
-+ font_size = pango_font_description_get_size (widget->style->font_desc);
-+ font_size = PANGO_PIXELS (font_size) * resolution / 72.0;
-
-- default_width = font_size * NUM_CHARS;
-- default_height = font_size * NUM_LINES;
--
-- if (impl->preview_widget_active && impl->preview_widget)
-- {
-- gtk_widget_size_request (impl->preview_box, &req);
-- default_width += PREVIEW_HBOX_SPACING + req.width;
-+ impl->default_width = font_size * NUM_CHARS;
-+ impl->default_height = font_size * NUM_LINES;
- }
-
-- if (impl->extra_widget)
-- {
-- gtk_widget_size_request (impl->extra_align, &req);
-- default_height += GTK_BOX (widget)->spacing + req.height;
-- }
--
-- gtk_widget_size_request (widget, &req);
-- default_width = MAX (default_width, req.width);
-- default_height = MAX (default_height, req.height);
--
-- *width = default_width;
-- *height = default_height;
-+ *width = impl->default_width;
-+ *height = impl->default_height;
- }
-
- static void
-@@ -7237,35 +7256,37 @@
- gint *default_height)
- {
- GtkFileChooserDefault *impl;
-+ GtkRequisition req;
-
- impl = GTK_FILE_CHOOSER_DEFAULT (chooser_embed);
- find_good_size_from_style (GTK_WIDGET (chooser_embed), default_width, default_height);
-+
-+ if (impl->preview_widget_active &&
-+ impl->preview_widget &&
-+ GTK_WIDGET_VISIBLE (impl->preview_widget))
-+ {
-+ gtk_widget_size_request (impl->preview_box, &req);
-+ *default_width += PREVIEW_HBOX_SPACING + req.width;
-+ }
-+
-+ if (impl->extra_widget &&
-+ GTK_WIDGET_VISIBLE (impl->extra_widget))
-+ {
-+ gtk_widget_size_request (impl->extra_align, &req);
-+ *default_height += GTK_BOX (chooser_embed)->spacing + req.height;
-+ }
- }
-
--static void
--gtk_file_chooser_default_get_resizable_hints (GtkFileChooserEmbed *chooser_embed,
-- gboolean *resize_horizontally,
-- gboolean *resize_vertically)
-+static gboolean
-+gtk_file_chooser_default_get_resizable (GtkFileChooserEmbed *chooser_embed)
- {
- GtkFileChooserDefault *impl;
-
-- g_return_if_fail (resize_horizontally != NULL);
-- g_return_if_fail (resize_vertically != NULL);
--
- impl = GTK_FILE_CHOOSER_DEFAULT (chooser_embed);
-
-- *resize_horizontally = TRUE;
-- *resize_vertically = TRUE;
--
-- if (impl->action == GTK_FILE_CHOOSER_ACTION_SAVE ||
-- impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER)
-- {
-- if (! gtk_expander_get_expanded (GTK_EXPANDER (impl->save_expander)))
-- {
-- *resize_horizontally = FALSE;
-- *resize_vertically = FALSE;
-- }
-- }
-+ return (impl->action == GTK_FILE_CHOOSER_ACTION_OPEN ||
-+ impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER ||
-+ gtk_expander_get_expanded (GTK_EXPANDER (impl->save_expander)));
- }
-
- struct switch_folder_closure {
-Index: gtk/gtkfilechooserprivate.h
-===================================================================
---- gtk/gtkfilechooserprivate.h (revision 17866)
-+++ gtk/gtkfilechooserprivate.h (revision 17867)
-@@ -109,10 +109,6 @@
- char *file_system;
-
- /* for use with GtkFileChooserEmbed */
-- gint default_width;
-- gint default_height;
-- gboolean resize_horizontally;
-- gboolean resize_vertically;
- gboolean response_requested;
- };
-
-@@ -254,6 +250,9 @@
- GSource *shortcuts_drag_outside_idle;
- #endif
-
-+ gint default_width;
-+ gint default_height;
-+
- /* Flags */
-
- guint local_only : 1;
Deleted: gtkiconcache-disable-debug.patch
===================================================================
--- gtkiconcache-disable-debug.patch 2008-04-20 11:51:30 UTC (rev 495)
+++ gtkiconcache-disable-debug.patch 2008-04-20 11:51:48 UTC (rev 496)
@@ -1,27 +0,0 @@
---- trunk/gtk/gtkiconcache.c 2007/05/23 15:06:03 17898
-+++ trunk/gtk/gtkiconcache.c 2007/09/14 02:11:01 18823
-@@ -127,14 +127,19 @@
- info.n_directories = 0;
- info.flags = CHECK_OFFSETS|CHECK_STRINGS;
-
-- if (!_gtk_icon_cache_validate (&info))
-+#ifdef G_ENABLE_DEBUG
-+ if (gtk_debug_flags & GTK_DEBUG_ICONTHEME)
- {
-- g_mapped_file_free (map);
-- g_warning ("Icon cache '%s' is invalid\n", cache_filename);
-+ if (!_gtk_icon_cache_validate (&info))
-+ {
-+ g_mapped_file_free (map);
-+ g_warning ("Icon cache '%s' is invalid\n", cache_filename);
-
-- goto done;
-+ goto done;
-+ }
- }
--
-+#endif
-+
- GTK_NOTE (ICONTHEME, g_print ("found cache for %s\n", path));
-
- cache = g_new0 (GtkIconCache, 1);
Deleted: gtksearchenginetracker-update-modulename.patch
===================================================================
--- gtksearchenginetracker-update-modulename.patch 2008-04-20 11:51:30 UTC (rev 495)
+++ gtksearchenginetracker-update-modulename.patch 2008-04-20 11:51:48 UTC (rev 496)
@@ -1,21 +0,0 @@
---- trunk/gtk/gtksearchenginetracker.c 2007/06/22 14:32:22 18219
-+++ trunk/gtk/gtksearchenginetracker.c 2007/09/18 21:48:01 18846
-@@ -71,10 +71,16 @@
- {
- int i;
- GModule *tracker;
-+ GModuleFlags flags;
-
- done = TRUE;
--
-- tracker = g_module_open ("libtracker.so.0", G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
-+ flags = G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL;
-+
-+ tracker = g_module_open ("libtrackerclient.so.0", flags);
-+
-+ if (!tracker)
-+ tracker = g_module_open ("libtracker.so.0", flags);
-+
- if (!tracker)
- return;
-
Deleted: gtkselection-dontcrash-on-null.patch
===================================================================
--- gtkselection-dontcrash-on-null.patch 2008-04-20 11:51:30 UTC (rev 495)
+++ gtkselection-dontcrash-on-null.patch 2008-04-20 11:51:48 UTC (rev 496)
@@ -1,43 +0,0 @@
---- trunk/gtk/gtkselection.c 2007/07/09 20:24:26 18423
-+++ trunk/gtk/gtkselection.c 2007/09/17 19:53:54 18842
-@@ -530,10 +530,11 @@
- * gtk_target_list_find:
- * @list: a #GtkTargetList
- * @target: an interned atom representing the target to search for
-- * @info: a pointer to the location to store application info for target
-- *
-+ * @info: a pointer to the location to store application info for target,
-+ * or %NULL
-+ *
- * Looks up a given target in a #GtkTargetList.
-- *
-+ *
- * Return value: %TRUE if the target was found, otherwise %FALSE
- **/
- gboolean
-@@ -541,16 +542,23 @@
- GdkAtom target,
- guint *info)
- {
-- GList *tmp_list = list->list;
-+ GList *tmp_list;
-+
-+ g_return_val_if_fail (list != NULL, FALSE);
-+
-+ tmp_list = list->list;
- while (tmp_list)
- {
- GtkTargetPair *pair = tmp_list->data;
-
- if (pair->target == target)
- {
-- *info = pair->info;
-+ if (info)
-+ *info = pair->info;
-+
- return TRUE;
- }
-+
- tmp_list = tmp_list->next;
- }
-
Deleted: scale-button-grab.patch
===================================================================
--- scale-button-grab.patch 2008-04-20 11:51:30 UTC (rev 495)
+++ scale-button-grab.patch 2008-04-20 11:51:48 UTC (rev 496)
@@ -1,42 +0,0 @@
-Index: gtk/gtkscalebutton.c
-===================================================================
---- gtk/gtkscalebutton.c (revision 18880)
-+++ gtk/gtkscalebutton.c (revision 18881)
-@@ -877,6 +877,9 @@
-
- priv = button->priv;
-
-+ if (!GTK_WIDGET_HAS_GRAB (priv->dock))
-+ return;
-+
- if (gtk_widget_is_ancestor (gtk_grab_get_current (), priv->dock))
- return;
-
-Index: tests/testvolumebutton.c
-===================================================================
---- tests/testvolumebutton.c (revision 18880)
-+++ tests/testvolumebutton.c (revision 18881)
-@@ -60,15 +60,22 @@
- {
- GtkWidget *window;
- GtkWidget *button;
-+ GtkWidget *button2;
-+ GtkWidget *box;
-
- gtk_init (&argc, &argv);
-
- window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
- button = gtk_volume_button_new ();
-+ button2 = gtk_volume_button_new ();
-+ box = gtk_hbox_new (FALSE, 0);
-+
- g_signal_connect (G_OBJECT (button),
- "value-changed",
- G_CALLBACK (value_changed), NULL);
-- gtk_container_add (GTK_CONTAINER (window), button);
-+ gtk_container_add (GTK_CONTAINER (window), box);
-+ gtk_container_add (GTK_CONTAINER (box), button);
-+ gtk_container_add (GTK_CONTAINER (box), button2);
-
- gtk_widget_show_all (window);
- gtk_button_clicked (GTK_BUTTON (button));
Deleted: simple-search-crash.patch
===================================================================
--- simple-search-crash.patch 2008-04-20 11:51:30 UTC (rev 495)
+++ simple-search-crash.patch 2008-04-20 11:51:48 UTC (rev 496)
@@ -1,84 +0,0 @@
-Index: gtk/gtksearchenginesimple.c
-===================================================================
---- gtk/gtksearchenginesimple.c (revision 18864)
-+++ gtk/gtksearchenginesimple.c (working copy)
-@@ -72,19 +72,27 @@ struct _GtkSearchEngineSimplePrivate
- G_DEFINE_TYPE (GtkSearchEngineSimple, _gtk_search_engine_simple, GTK_TYPE_SEARCH_ENGINE);
-
- static void
--finalize (GObject *object)
-+gtk_search_engine_simple_dispose (GObject *object)
- {
- GtkSearchEngineSimple *simple;
-+ GtkSearchEngineSimplePrivate *priv;
-
- simple = GTK_SEARCH_ENGINE_SIMPLE (object);
-+ priv = simple->priv;
-
-- if (simple->priv->query)
-+ if (priv->query)
-+ {
-+ g_object_unref (priv->query);
-+ priv->query = NULL;
-+ }
-+
-+ if (priv->active_search)
- {
-- g_object_unref (simple->priv->query);
-- simple->priv->query = NULL;
-+ priv->active_search->cancelled = TRUE;
-+ priv->active_search = NULL;
- }
-
-- G_OBJECT_CLASS (_gtk_search_engine_simple_parent_class)->finalize (object);
-+ G_OBJECT_CLASS (_gtk_search_engine_simple_parent_class)->dispose (object);
- }
-
- static SearchThreadData *
-@@ -131,12 +139,10 @@ search_thread_done_idle (gpointer user_d
-
- data = user_data;
-
-- if (!data->cancelled)
-- {
-- _gtk_search_engine_finished (GTK_SEARCH_ENGINE (data->engine));
-- data->engine->priv->active_search = NULL;
-- }
--
-+ if (!data->cancelled)
-+ _gtk_search_engine_finished (GTK_SEARCH_ENGINE (data->engine));
-+
-+ data->engine->priv->active_search = NULL;
- search_thread_data_free (data);
-
- return FALSE;
-@@ -181,6 +187,7 @@ send_batch (SearchThreadData *data)
- hits = g_new (SearchHits, 1);
- hits->uris = data->uri_hits;
- hits->thread_data = data;
-+
- gdk_threads_add_idle (search_thread_add_hits_idle, hits);
- }
- data->uri_hits = NULL;
-@@ -349,7 +356,7 @@ _gtk_search_engine_simple_class_init (Gt
- GtkSearchEngineClass *engine_class;
-
- gobject_class = G_OBJECT_CLASS (class);
-- gobject_class->finalize = finalize;
-+ gobject_class->dispose = gtk_search_engine_simple_dispose;
-
- engine_class = GTK_SEARCH_ENGINE_CLASS (class);
- engine_class->set_query = gtk_search_engine_simple_set_query;
-Index: gtk/gtkfilechooserdefault.c
-===================================================================
---- gtk/gtkfilechooserdefault.c (revision 18864)
-+++ gtk/gtkfilechooserdefault.c (working copy)
-@@ -8994,6 +8994,8 @@ search_stop_searching (GtkFileChooserDef
-
- if (impl->search_engine)
- {
-+ _gtk_search_engine_stop (impl->search_engine);
-+
- g_object_unref (impl->search_engine);
- impl->search_engine = NULL;
- }
Deleted: swt-tooltips.patch
===================================================================
--- swt-tooltips.patch 2008-04-20 11:51:30 UTC (rev 495)
+++ swt-tooltips.patch 2008-04-20 11:51:48 UTC (rev 496)
@@ -1,13 +0,0 @@
-diff -up gtk+-2.12.0/gtk/gtktooltips.c.swt-tooltips gtk+-2.12.0/gtk/gtktooltips.c
---- gtk+-2.12.0/gtk/gtktooltips.c.swt-tooltips 2007-09-20 15:47:54.000000000 -0400
-+++ gtk+-2.12.0/gtk/gtktooltips.c 2007-09-20 15:48:22.000000000 -0400
-@@ -229,7 +229,8 @@ gtk_tooltips_set_tip (GtkTooltips *toolt
- return;
- }
-
-- if (tooltips->active_tips_data
-+ if (tooltipsdata
-+ && tooltips->active_tips_data
- && tooltips->active_tips_data->widget == widget
- && GTK_WIDGET_DRAWABLE (tooltips->active_tips_data->widget))
- {
More information about the arch-commits
mailing list