Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 517018 | Differences between
and this patch

Collapse All | Expand All

(-)a/src/fr-window.c (-10 / +24 lines)
Lines 638-644 fr_window_free_private_data (FrWindow *window) Link Here
638
	_g_object_unref (window->priv->settings_ui);
638
	_g_object_unref (window->priv->settings_ui);
639
	_g_object_unref (window->priv->settings_general);
639
	_g_object_unref (window->priv->settings_general);
640
	_g_object_unref (window->priv->settings_dialogs);
640
	_g_object_unref (window->priv->settings_dialogs);
641
	_g_object_unref (window->priv->settings_caja);
641
642
	if (window->priv->settings_caja)
643
		_g_object_unref (window->priv->settings_caja);
642
}
644
}
643
645
644
646
Lines 4598-4608 static gboolean Link Here
4598
is_single_click_policy (FrWindow *window)
4600
is_single_click_policy (FrWindow *window)
4599
{
4601
{
4600
	char     *value;
4602
	char     *value;
4601
	gboolean  result;
4603
	gboolean  result = FALSE;
4602
4604
4603
	value = g_settings_get_string (window->priv->settings_caja, CAJA_CLICK_POLICY);
4605
	if (window->priv->settings_caja) {
4604
	result = (value != NULL) && (strncmp (value, "single", 6) == 0);
4606
		value = g_settings_get_string (window->priv->settings_caja, CAJA_CLICK_POLICY);
4605
	g_free (value);
4607
		result = (value != NULL) && (strncmp (value, "single", 6) == 0);
4608
		g_free (value);
4609
	}
4606
4610
4607
	return result;
4611
	return result;
4608
}
4612
}
Lines 5384-5389 fr_window_construct (FrWindow *window) Link Here
5384
	GtkToolItem      *open_recent_tool_item;
5388
	GtkToolItem      *open_recent_tool_item;
5385
	GtkWidget        *menu_item;
5389
	GtkWidget        *menu_item;
5386
	GError           *error = NULL;
5390
	GError           *error = NULL;
5391
	GSettingsSchemaSource *schema_source;
5392
	GSettingsSchema  *caja_schema;
5387
5393
5388
	/* data common to all windows. */
5394
	/* data common to all windows. */
5389
5395
Lines 5401-5407 fr_window_construct (FrWindow *window) Link Here
5401
	window->priv->settings_ui = g_settings_new (ENGRAMPA_SCHEMA_UI);
5407
	window->priv->settings_ui = g_settings_new (ENGRAMPA_SCHEMA_UI);
5402
	window->priv->settings_general = g_settings_new (ENGRAMPA_SCHEMA_GENERAL);
5408
	window->priv->settings_general = g_settings_new (ENGRAMPA_SCHEMA_GENERAL);
5403
	window->priv->settings_dialogs = g_settings_new (ENGRAMPA_SCHEMA_DIALOGS);
5409
	window->priv->settings_dialogs = g_settings_new (ENGRAMPA_SCHEMA_DIALOGS);
5404
	window->priv->settings_caja = g_settings_new (CAJA_SCHEMA);
5410
5411
	schema_source = g_settings_schema_source_get_default ();
5412
	caja_schema = g_settings_schema_source_lookup (schema_source, CAJA_SCHEMA, FALSE);
5413
	if (caja_schema) {
5414
		window->priv->settings_caja = g_settings_new (CAJA_SCHEMA);
5415
		g_settings_schema_unref (caja_schema);
5416
	}
5405
5417
5406
	/* Create the application. */
5418
	/* Create the application. */
5407
5419
Lines 5994-6003 fr_window_construct (FrWindow *window) Link Here
5994
			"changed::" PREF_LISTING_USE_MIME_ICONS,
6006
			"changed::" PREF_LISTING_USE_MIME_ICONS,
5995
			G_CALLBACK (pref_use_mime_icons_changed),
6007
			G_CALLBACK (pref_use_mime_icons_changed),
5996
			window);
6008
			window);
5997
	g_signal_connect (window->priv->settings_caja,
6009
5998
			"changed::" CAJA_CLICK_POLICY,
6010
	if (window->priv->settings_caja)
5999
			G_CALLBACK (pref_click_policy_changed),
6011
		g_signal_connect (window->priv->settings_caja,
6000
			window);
6012
				"changed::" CAJA_CLICK_POLICY,
6013
				G_CALLBACK (pref_click_policy_changed),
6014
				window);
6001
6015
6002
	/* Give focus to the list. */
6016
	/* Give focus to the list. */
6003
6017

Return to bug 517018