Attachment #47151 for bug #76068




  priv->website = NULL;
  priv->website_label = NULL;
  priv->translator_credits = NULL;
  priv->license = NULL;
  priv->authors = NULL;
  priv->documenters = NULL;
  priv->artists = NULL;

 * Returns the icon name displayed as logo in the about dialog.
 * 
 * Return value: the icon name displayed as logo. The string is
 *   owned by the dialog. If you want to keep a reference
 *   to it, you have to call g_strdup() on it.
 *
 * Since: 2.6

gtk_about_dialog_get_logo_icon_name (GtkAboutDialog *about)
{
  GtkAboutDialogPrivate *priv;
  const gchar *icon_name = NULL;
  
  g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), NULL);


Lines 1076-1081 Link Here

(-)gtk/gtkactiongroup.c (+3 lines)
1076		1076
1077	g_return_val_if_fail (GTK_IS_ACTION_GROUP (action_group), string);	1077	g_return_val_if_fail (GTK_IS_ACTION_GROUP (action_group), string);
1078		1078
		1079	if (string == NULL)
		1080	return NULL;
		1081
1079	translate_func = action_group->private_data->translate_func;	1082	translate_func = action_group->private_data->translate_func;
1080	translate_data = action_group->private_data->translate_data;	1083	translate_data = action_group->private_data->translate_data;
1081		1084

Lines 1617-1622 Link Here

(-)gtk/gtkfilechooserdefault.c (-2 / +15 lines)
1617	static gboolean	1617	static gboolean
1618	edited_idle_cb (GtkFileChooserDefault *impl)	1618	edited_idle_cb (GtkFileChooserDefault *impl)
1619	{	1619	{
		1620	GDK_THREADS_ENTER ();
		1621
1620	g_source_destroy (impl->edited_idle);	1622	g_source_destroy (impl->edited_idle);
1621	impl->edited_idle = NULL;	1623	impl->edited_idle = NULL;
1622		1624
Lines 1652-1657 Link Here
1652	impl->edited_new_text = NULL;	1654	impl->edited_new_text = NULL;
1653	}	1655	}
1654		1656
		1657	GDK_THREADS_LEAVE ();
		1658
1655	return FALSE;	1659	return FALSE;
1656	}	1660	}
1657		1661
Lines 1977-1983 Link Here
1977	gtk_tree_model_sort_convert_iter_to_child_iter (closure->impl->sort_model, &child_iter, iter);	1981	gtk_tree_model_sort_convert_iter_to_child_iter (closure->impl->sort_model, &child_iter, iter);
1978		1982
1979	info = _gtk_file_system_model_get_info (closure->impl->browse_files_model, &child_iter);	1983	info = _gtk_file_system_model_get_info (closure->impl->browse_files_model, &child_iter);
1980	is_folder = gtk_file_info_get_is_folder (info);	1984	is_folder = info ? gtk_file_info_get_is_folder (info) : FALSE;
1981		1985
1982	closure->all_folders = closure->all_folders && is_folder;	1986	closure->all_folders = closure->all_folders && is_folder;
1983	closure->all_files = closure->all_files && !is_folder;	1987	closure->all_files = closure->all_files && !is_folder;
Lines 2367-2376 Link Here
2367	static gboolean	2371	static gboolean
2368	shortcuts_drag_outside_idle_cb (GtkFileChooserDefault *impl)	2372	shortcuts_drag_outside_idle_cb (GtkFileChooserDefault *impl)
2369	{	2373	{
		2374	GDK_THREADS_ENTER ();
		2375
2370	shortcuts_drag_set_delete_cursor (impl, TRUE);	2376	shortcuts_drag_set_delete_cursor (impl, TRUE);
2371	impl->shortcuts_drag_outside = TRUE;	2377	impl->shortcuts_drag_outside = TRUE;
2372		2378
2373	shortcuts_cancel_drag_outside_idle (impl);	2379	shortcuts_cancel_drag_outside_idle (impl);
		2380
		2381	GDK_THREADS_LEAVE ();
		2382
2374	return FALSE;	2383	return FALSE;
2375	}	2384	}
2376	#endif	2385	#endif
Lines 4232-4237 Link Here
4232	{	4241	{
4233	GtkFileChooserDefault *impl;	4242	GtkFileChooserDefault *impl;
4234		4243
		4244	GDK_THREADS_ENTER ();
		4245
4235	impl = GTK_FILE_CHOOSER_DEFAULT (data);	4246	impl = GTK_FILE_CHOOSER_DEFAULT (data);
4236	g_assert (impl->load_state == LOAD_LOADING);	4247	g_assert (impl->load_state == LOAD_LOADING);
4237	g_assert (impl->load_timeout_id != 0);	4248	g_assert (impl->load_timeout_id != 0);
Lines 4242-4247 Link Here
4242		4253
4243	load_set_model (impl);	4254	load_set_model (impl);
4244		4255
		4256	GDK_THREADS_LEAVE ();
		4257
4245	return FALSE;	4258	return FALSE;
4246	}	4259	}
4247		4260
Lines 5584-5590 Link Here
5584		5597
5585	info = _gtk_file_system_model_get_info (impl->browse_files_model, &child_iter);	5598	info = _gtk_file_system_model_get_info (impl->browse_files_model, &child_iter);
5586		5599
5587	if (!gtk_file_info_get_is_folder (info))	5600	if (info && !gtk_file_info_get_is_folder (info))
5588	return FALSE;	5601	return FALSE;
5589	}	5602	}
5590		5603

Lines 391-405 Link Here

(-)gtk/gtkfilechooserentry.c (-5 / +18 lines)
391	GtkFilePath *unique_path = NULL;	391	GtkFilePath *unique_path = NULL;
392	gboolean valid;	392	gboolean valid;
393		393
		394	GDK_THREADS_ENTER ();
		395
394	g_assert (chooser_entry->file_part);	396	g_assert (chooser_entry->file_part);
395		397
396	chooser_entry->check_completion_idle = NULL;	398	chooser_entry->check_completion_idle = NULL;
397		399
398	if (strcmp (chooser_entry->file_part, "") == 0)	400	if (strcmp (chooser_entry->file_part, "") == 0)
399	return FALSE;	401	goto done;
400		402
401	if (chooser_entry->completion_store == NULL)	403	if (chooser_entry->completion_store == NULL)
402	return FALSE;	404	goto done;
403		405
404	valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (chooser_entry->completion_store),	406	valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (chooser_entry->completion_store),
405	&iter);	407	&iter);
Lines 497-502 Link Here
497	g_free (common_prefix);	499	g_free (common_prefix);
498	}	500	}
499		501
		502	done:
		503
		504	GDK_THREADS_LEAVE ();
		505
500	return FALSE;	506	return FALSE;
501	}	507	}
502		508
Lines 578-594 Link Here
578	{	584	{
579	GSList *child_paths = NULL;	585	GSList *child_paths = NULL;
580		586
		587	GDK_THREADS_ENTER ();
		588
581	chooser_entry->load_directory_idle = NULL;	589	chooser_entry->load_directory_idle = NULL;
582		590
583	/* guard against bogus settings*/	591	/* guard against bogus settings*/
584	if (chooser_entry->current_folder_path == NULL \|\|	592	if (chooser_entry->current_folder_path == NULL \|\|
585	chooser_entry->file_system == NULL)	593	chooser_entry->file_system == NULL)
586	return FALSE;	594	goto done;
587		595
588	if (chooser_entry->current_folder != NULL)	596	if (chooser_entry->current_folder != NULL)
589	{	597	{
590	g_warning ("idle activate multiple times without clearing the folder object first.");	598	g_warning ("idle activate multiple times without clearing the folder object first.");
591	return FALSE;	599	goto done;
592	}	600	}
593	g_assert (chooser_entry->completion_store == NULL);	601	g_assert (chooser_entry->completion_store == NULL);
594		602
Lines 600-606 Link Here
600		608
601	/* There is no folder by that name */	609	/* There is no folder by that name */
602	if (!chooser_entry->current_folder)	610	if (!chooser_entry->current_folder)
603	return FALSE;	611	goto done;
604	g_signal_connect (chooser_entry->current_folder, "files-added",	612	g_signal_connect (chooser_entry->current_folder, "files-added",
605	G_CALLBACK (files_added_cb), chooser_entry);	613	G_CALLBACK (files_added_cb), chooser_entry);
606	g_signal_connect (chooser_entry->current_folder, "files-removed",	614	g_signal_connect (chooser_entry->current_folder, "files-removed",
Lines 625-630 Link Here
625		633
626	gtk_entry_completion_set_model (gtk_entry_get_completion (GTK_ENTRY (chooser_entry)),	634	gtk_entry_completion_set_model (gtk_entry_get_completion (GTK_ENTRY (chooser_entry)),
627	GTK_TREE_MODEL (chooser_entry->completion_store));	635	GTK_TREE_MODEL (chooser_entry->completion_store));
		636
		637	done:
		638
		639	GDK_THREADS_LEAVE ();
		640
628	return FALSE;	641	return FALSE;
629	}	642	}
630		643




				  gint          column)

{
  GtkTreePath *path;

  path = gtk_tree_model_get_path (GTK_TREE_MODEL (list_store), iter);
  gtk_tree_model_row_changed (GTK_TREE_MODEL (list_store), path, iter);
  gtk_tree_path_free (path);

  if (!iter_is_sorted (list_store, iter))
    {

                                  gtk_list_store_compare_func,
                                  list_store);
      order = generate_order (list_store->seq, old_positions);
      path = gtk_tree_path_new ();
      gtk_tree_model_rows_reordered (GTK_TREE_MODEL (list_store),
                                     path, NULL, order);
      gtk_tree_path_free (path);
      g_free (order);
    }

  gtk_tree_path_free (tmp_path);
}

static gboolean

Lines 174-180 Link Here

(-)gtk/gtkmessagedialog.c (-1 / +2 lines)
174	priv->has_primary_markup = FALSE;	174	priv->has_primary_markup = FALSE;
175	priv->has_secondary_text = FALSE;	175	priv->has_secondary_text = FALSE;
176	priv->secondary_label = gtk_label_new (NULL);	176	priv->secondary_label = gtk_label_new (NULL);
177		177	gtk_widget_set_no_show_all (priv->secondary_label, TRUE);
		178
178	dialog->label = gtk_label_new (NULL);	179	dialog->label = gtk_label_new (NULL);
179	dialog->image = gtk_image_new_from_stock (NULL, GTK_ICON_SIZE_DIALOG);	180	dialog->image = gtk_image_new_from_stock (NULL, GTK_ICON_SIZE_DIALOG);
180	gtk_misc_set_alignment (GTK_MISC (dialog->image), 0.5, 0.0);	181	gtk_misc_set_alignment (GTK_MISC (dialog->image), 0.5, 0.0);

Return to bug 76068

Lines 424-429 Link Here

(-)gtk/gtkaboutdialog.c (-2 / +3 lines)
424	priv->website = NULL;	424	priv->website = NULL;
425	priv->website_label = NULL;	425	priv->website_label = NULL;
426	priv->translator_credits = NULL;	426	priv->translator_credits = NULL;
		427	priv->license = NULL;
427	priv->authors = NULL;	428	priv->authors = NULL;
428	priv->documenters = NULL;	429	priv->documenters = NULL;
429	priv->artists = NULL;	430	priv->artists = NULL;
Lines 1439-1445 Link Here
1439	* Returns the icon name displayed as logo in the about dialog.	1440	* Returns the icon name displayed as logo in the about dialog.
1440	*	1441	*
1441	* Return value: the icon name displayed as logo. The string is	1442	* Return value: the icon name displayed as logo. The string is
1442	* owned by the about dialog. If you want to keep a reference	1443	* owned by the dialog. If you want to keep a reference
1443	* to it, you have to call g_strdup() on it.	1444	* to it, you have to call g_strdup() on it.
1444	*	1445	*
1445	* Since: 2.6	1446	* Since: 2.6
Lines 1448-1454 Link Here
1448	gtk_about_dialog_get_logo_icon_name (GtkAboutDialog *about)	1449	gtk_about_dialog_get_logo_icon_name (GtkAboutDialog *about)
1449	{	1450	{
1450	GtkAboutDialogPrivate *priv;	1451	GtkAboutDialogPrivate *priv;
1451	const gchar *icon_name;	1452	const gchar *icon_name = NULL;
1452		1453
1453	g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), NULL);	1454	g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), NULL);
1454		1455

Lines 1716-1725 Link Here

(-)gtk/gtkliststore.c (-6 / +7 lines)
1716	gint column)	1716	gint column)
1717		1717
1718	{	1718	{
1719	GtkTreePath *tmp_path;	1719	GtkTreePath *path;
1720		1720
1721	tmp_path = gtk_tree_model_get_path (GTK_TREE_MODEL (list_store), iter);	1721	path = gtk_tree_model_get_path (GTK_TREE_MODEL (list_store), iter);
1722	gtk_tree_model_row_changed (GTK_TREE_MODEL (list_store), tmp_path, iter);	1722	gtk_tree_model_row_changed (GTK_TREE_MODEL (list_store), path, iter);
		1723	gtk_tree_path_free (path);
1723		1724
1724	if (!iter_is_sorted (list_store, iter))	1725	if (!iter_is_sorted (list_store, iter))
1725	{	1726	{
Lines 1731-1742 Link Here
1731	gtk_list_store_compare_func,	1732	gtk_list_store_compare_func,
1732	list_store);	1733	list_store);
1733	order = generate_order (list_store->seq, old_positions);	1734	order = generate_order (list_store->seq, old_positions);
		1735	path = gtk_tree_path_new ();
1734	gtk_tree_model_rows_reordered (GTK_TREE_MODEL (list_store),	1736	gtk_tree_model_rows_reordered (GTK_TREE_MODEL (list_store),
1735	tmp_path, NULL, order);	1737	path, NULL, order);
		1738	gtk_tree_path_free (path);
1736	g_free (order);	1739	g_free (order);
1737	}	1740	}
1738
1739	gtk_tree_path_free (tmp_path);
1740	}	1741	}
1741		1742
1742	static gboolean	1743	static gboolean