From 9f326d612bb037451455463f2f9f6863a6fbd3f1 Mon Sep 17 00:00:00 2001 From: Manish Singh Date: Wed, 18 Aug 2004 15:45:13 +0000 Subject: [PATCH] Applied patch from Olivier Andrieu to fix bug #150440. Wed Aug 18 08:31:17 2004 Manish Singh * gtk/gtkiconview.c: Applied patch from Olivier Andrieu to fix bug #150440. * gtk/gtkicontheme.c (gtk_icon_theme_init): xdg_data_dirs should match constness attributes of g_get_system_data_dirs (). --- ChangeLog | 8 ++++++++ ChangeLog.pre-2-10 | 8 ++++++++ ChangeLog.pre-2-6 | 8 ++++++++ ChangeLog.pre-2-8 | 8 ++++++++ gtk/gtkicontheme.c | 4 ++-- gtk/gtkiconview.c | 29 ++++++++++++++++------------- 6 files changed, 50 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index b3724e68d..e693ee4a1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Wed Aug 18 08:31:17 2004 Manish Singh + + * gtk/gtkiconview.c: Applied patch from Olivier Andrieu to fix + bug #150440. + + * gtk/gtkicontheme.c (gtk_icon_theme_init): xdg_data_dirs should + match constness attributes of g_get_system_data_dirs (). + 2004-08-17 Matthias Clasen * gtk/gtkicontheme.c (gtk_icon_theme_init): Look up icon themes in the diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index b3724e68d..e693ee4a1 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +Wed Aug 18 08:31:17 2004 Manish Singh + + * gtk/gtkiconview.c: Applied patch from Olivier Andrieu to fix + bug #150440. + + * gtk/gtkicontheme.c (gtk_icon_theme_init): xdg_data_dirs should + match constness attributes of g_get_system_data_dirs (). + 2004-08-17 Matthias Clasen * gtk/gtkicontheme.c (gtk_icon_theme_init): Look up icon themes in the diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index b3724e68d..e693ee4a1 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +Wed Aug 18 08:31:17 2004 Manish Singh + + * gtk/gtkiconview.c: Applied patch from Olivier Andrieu to fix + bug #150440. + + * gtk/gtkicontheme.c (gtk_icon_theme_init): xdg_data_dirs should + match constness attributes of g_get_system_data_dirs (). + 2004-08-17 Matthias Clasen * gtk/gtkicontheme.c (gtk_icon_theme_init): Look up icon themes in the diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index b3724e68d..e693ee4a1 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +Wed Aug 18 08:31:17 2004 Manish Singh + + * gtk/gtkiconview.c: Applied patch from Olivier Andrieu to fix + bug #150440. + + * gtk/gtkicontheme.c (gtk_icon_theme_init): xdg_data_dirs should + match constness attributes of g_get_system_data_dirs (). + 2004-08-17 Matthias Clasen * gtk/gtkicontheme.c (gtk_icon_theme_init): Look up icon themes in the diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c index edc6ca64b..d46b1202a 100644 --- a/gtk/gtkicontheme.c +++ b/gtk/gtkicontheme.c @@ -524,7 +524,7 @@ static void gtk_icon_theme_init (GtkIconTheme *icon_theme) { GtkIconThemePrivate *priv; - gchar **xdg_data_dirs; + const gchar * const *xdg_data_dirs; int i, j; priv = g_type_instance_get_private ((GTypeInstance *)icon_theme, @@ -570,7 +570,7 @@ do_theme_change (GtkIconTheme *icon_theme) GtkIconThemePrivate *priv = icon_theme->priv; blow_themes (icon_theme); - g_signal_emit (G_OBJECT (icon_theme), signal_changed, 0); + g_signal_emit (icon_theme, signal_changed, 0); if (priv->screen && priv->is_screen_singleton) { diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c index 23b002510..b2a8dc279 100644 --- a/gtk/gtkiconview.c +++ b/gtk/gtkiconview.c @@ -1973,8 +1973,12 @@ gtk_icon_view_set_cursor_item (GtkIconView *icon_view, /* Notify that accessible focus object has changed */ obj = gtk_widget_get_accessible (GTK_WIDGET (icon_view)); item_obj = atk_object_ref_accessible_child (obj, item->index); - atk_focus_tracker_notify (item_obj); - g_object_unref (item_obj); + + if (item_obj != NULL) + { + atk_focus_tracker_notify (item_obj); + g_object_unref (item_obj); + } } @@ -3414,7 +3418,7 @@ gtk_icon_view_item_activated (GtkIconView *icon_view, g_return_if_fail (GTK_IS_ICON_VIEW (icon_view)); g_return_if_fail (path != NULL); - g_signal_emit (G_OBJECT (icon_view), icon_view_signals[ITEM_ACTIVATED], 0, path); + g_signal_emit (icon_view, icon_view_signals[ITEM_ACTIVATED], 0, path); } /** @@ -3527,7 +3531,7 @@ gtk_icon_view_item_accessible_idle_do_action (gpointer data) GtkTreePath *path; item = GTK_ICON_VIEW_ITEM_ACCESSIBLE (data); - item->action_idle_handler = NULL; + item->action_idle_handler = 0; if (item->widget == NULL) return FALSE; @@ -4215,7 +4219,6 @@ static gint gtk_icon_view_item_accessible_text_get_character_count (AtkText *text) { GtkIconViewItemAccessible *item; - GtkTextIter start, end; item = GTK_ICON_VIEW_ITEM_ACCESSIBLE (text); @@ -4489,9 +4492,11 @@ gtk_icon_view_item_accessible_set_visibility (GtkIconViewItemAccessible *item, gboolean emit_signal) { if (gtk_icon_view_item_accessible_is_showing (item)) - gtk_icon_view_item_accessible_add_state (item, ATK_STATE_SHOWING, emit_signal); + return gtk_icon_view_item_accessible_add_state (item, ATK_STATE_SHOWING, + emit_signal); else - gtk_icon_view_item_accessible_remove_state (item, ATK_STATE_SHOWING, emit_signal); + return gtk_icon_view_item_accessible_remove_state (item, ATK_STATE_SHOWING, + emit_signal); } static void @@ -4760,7 +4765,6 @@ gtk_icon_view_accessible_get_n_children (AtkObject *accessible) { GtkIconView *icon_view; GtkWidget *widget; - gint i; widget = GTK_ACCESSIBLE (accessible)->widget; if (!widget) @@ -4994,9 +4998,9 @@ gtk_icon_view_accessible_model_row_inserted (GtkTreeModel *tree_model, if (info->index != item->item->index) { if (info->index < index) - g_warning ("Unexpected index value on insetion %d %d", index, info->index); + g_warning ("Unexpected index value on insertion %d %d", index, info->index); - if (tmp_list = NULL) + if (tmp_list == NULL) tmp_list = items; info->index = item->item->index; @@ -5033,6 +5037,7 @@ gtk_icon_view_accessible_model_row_deleted (GtkTreeModel *tree_model, items = priv->items; tmp_list = NULL; deleted_item = NULL; + info = NULL; while (items) { info = items->data; @@ -5043,7 +5048,7 @@ gtk_icon_view_accessible_model_row_deleted (GtkTreeModel *tree_model, } if (info->index != item->item->index) { - if (tmp_list = NULL) + if (tmp_list == NULL) tmp_list = items; else info->index = item->item->index; @@ -5089,7 +5094,6 @@ gtk_icon_view_accessible_model_rows_reordered (GtkTreeModel *tree_model, GtkIconViewItemAccessible *item; GList *items; GList *tmp_list; - GList *new_list; AtkObject *atk_obj; atk_obj = gtk_widget_get_accessible (GTK_WIDGET (user_data)); @@ -5531,7 +5535,6 @@ gtk_icon_view_accessible_select_all_selection (AtkSelection *selection) { GtkWidget *widget; GtkIconView *icon_view; - GList *l; widget = GTK_ACCESSIBLE (selection)->widget; if (widget == NULL) -- 2.43.2