callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GtkRecentManager: Allow instantiating with gtk_init

Browse Source 
This apparently used to work, and it doesn't do harm to allow it.

https://bugzilla.gnome.org/show_bug.cgi?id=705582
This commit is contained in:
Matthias Clasen
2014-12-21 23:14:02 -05:00
parent 53c388b724
commit 4bc3f02d51
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
gtk/gtkrecentmanager.c
View File

@ -346,8 +346,9 @@ gtk_recent_manager_init (GtkRecentManager *manager)
priv->filename = NULL;
settings = gtk_settings_get_default ();
g_signal_connect_swapped (settings, "notify::gtk-recent-files-enabled",
G_CALLBACK (gtk_recent_manager_enabled_changed), manager);
if (settings)
g_signal_connect_swapped (settings, "notify::gtk-recent-files-enabled",
G_CALLBACK (gtk_recent_manager_enabled_changed), manager);
}
static void
@ -470,14 +471,21 @@ gtk_recent_manager_real_changed (GtkRecentManager *manager)
}
else
{
GtkSettings *settings = gtk_settings_get_default ();
gint age = 30;
GtkSettings *settings;
gint age;
gboolean enabled;
g_object_get (G_OBJECT (settings),
"gtk-recent-files-max-age", &age,
"gtk-recent-files-enabled", &enabled,
NULL);
settings = gtk_settings_get_default ();
if (settings)
g_object_get (G_OBJECT (settings),
"gtk-recent-files-max-age", &age,
"gtk-recent-files-enabled", &enabled,
NULL);
else
{
age = 30;
enabled = TRUE;
}
if (age == 0 || !enabled)
{