AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Do nothing if we have no screen. Fixes #137260.

Browse Source 
2004-03-17  Morten Welinder  <terra@gnome.org>

	* gtk/gtkfilechooserdefault.c (check_icon_theme): Do nothing if we
	have no screen.  Fixes #137260.
	(shortcuts_add_bookmark_from_path): Simplify using check_is_folder
	thereby fixing leak.  Fixes #137259.
This commit is contained in:
Morten Welinder 2004-03-17 15:34:21 +00:00 committed by Morten Welinder
parent feba65f266
commit 8d3344036c
6 changed files with 51 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,9 +1,14 @@
2004-03-17 Morten Welinder <terra@gnome.org>
* gtk/gtkfilechooserdefault.c (check_icon_theme): Do nothing if we
have no screen. Fixes #137260.
(shortcuts_add_bookmark_from_path): Simplify using check_is_folder
thereby fixing leak. Fixes #137259.
* gtk/gtkpathbar.c (gtk_path_bar_forall): Make this work when the
slider buttons have been destroyed.
(gtk_path_bar_remove): Make this work for slider buttons too.
Fixes http://bugzilla.gnome.org/show_bug.cgi?id=137257
Fixes #137257
2004-03-15 Morten Welinder <terra@gnome.org>

7
ChangeLog.pre-2-10
View File

@ -1,9 +1,14 @@
2004-03-17 Morten Welinder <terra@gnome.org>
* gtk/gtkfilechooserdefault.c (check_icon_theme): Do nothing if we
have no screen. Fixes #137260.
(shortcuts_add_bookmark_from_path): Simplify using check_is_folder
thereby fixing leak. Fixes #137259.
* gtk/gtkpathbar.c (gtk_path_bar_forall): Make this work when the
slider buttons have been destroyed.
(gtk_path_bar_remove): Make this work for slider buttons too.
Fixes http://bugzilla.gnome.org/show_bug.cgi?id=137257
Fixes #137257
2004-03-15 Morten Welinder <terra@gnome.org>

7
ChangeLog.pre-2-4
View File

@ -1,9 +1,14 @@
2004-03-17 Morten Welinder <terra@gnome.org>
* gtk/gtkfilechooserdefault.c (check_icon_theme): Do nothing if we
have no screen. Fixes #137260.
(shortcuts_add_bookmark_from_path): Simplify using check_is_folder
thereby fixing leak. Fixes #137259.
* gtk/gtkpathbar.c (gtk_path_bar_forall): Make this work when the
slider buttons have been destroyed.
(gtk_path_bar_remove): Make this work for slider buttons too.
Fixes http://bugzilla.gnome.org/show_bug.cgi?id=137257
Fixes #137257
2004-03-15 Morten Welinder <terra@gnome.org>

7
ChangeLog.pre-2-6
View File

@ -1,9 +1,14 @@
2004-03-17 Morten Welinder <terra@gnome.org>
* gtk/gtkfilechooserdefault.c (check_icon_theme): Do nothing if we
have no screen. Fixes #137260.
(shortcuts_add_bookmark_from_path): Simplify using check_is_folder
thereby fixing leak. Fixes #137259.
* gtk/gtkpathbar.c (gtk_path_bar_forall): Make this work when the
slider buttons have been destroyed.
(gtk_path_bar_remove): Make this work for slider buttons too.
Fixes http://bugzilla.gnome.org/show_bug.cgi?id=137257
Fixes #137257
2004-03-15 Morten Welinder <terra@gnome.org>

7
ChangeLog.pre-2-8
View File

@ -1,9 +1,14 @@
2004-03-17 Morten Welinder <terra@gnome.org>
* gtk/gtkfilechooserdefault.c (check_icon_theme): Do nothing if we
have no screen. Fixes #137260.
(shortcuts_add_bookmark_from_path): Simplify using check_is_folder
thereby fixing leak. Fixes #137259.
* gtk/gtkpathbar.c (gtk_path_bar_forall): Make this work when the
slider buttons have been destroyed.
(gtk_path_bar_remove): Make this work for slider buttons too.
Fixes http://bugzilla.gnome.org/show_bug.cgi?id=137257
Fixes #137257
2004-03-15 Morten Welinder <terra@gnome.org>

51
gtk/gtkfilechooserdefault.c
View File

@ -1625,42 +1625,30 @@ shortcuts_add_bookmark_from_path (GtkFileChooserDefault *impl,
const GtkFilePath *path,
int pos)
{
GtkFileInfo *info;
GError *error;
gboolean result;
if (shortcut_find_position (impl, path) != -1)
return FALSE;
result = FALSE;
/* FIXME: this check really belongs in gtk_file_system_insert_bookmark. */
error = NULL;
if (!check_is_folder (impl->file_system, path, &error))
{
error_dialog (impl,
_("Could not add bookmark for %s because it is not a folder."),
path,
error);
return FALSE;
}
error = NULL;
info = get_file_info (impl->file_system, path, FALSE, &error);
if (!info)
error_getting_info_dialog (impl, path, error);
else if (!gtk_file_info_get_is_folder (info))
if (!gtk_file_system_insert_bookmark (impl->file_system, path, pos, &error))
{
char *msg;
char *uri;
uri = gtk_file_system_path_to_uri (impl->file_system, path);
msg = g_strdup_printf (_("Could not add bookmark for %s because it is not a folder."),
uri);
error_message (impl, msg);
g_free (uri);
g_free (msg);
}
else
{
error = NULL;
if (gtk_file_system_insert_bookmark (impl->file_system, path, pos, &error))
result = TRUE;
else
error_could_not_add_bookmark_dialog (impl, path, error);
error_could_not_add_bookmark_dialog (impl, path, error);
return FALSE;
}
return result;
return TRUE;
}
static void
@ -3427,11 +3415,14 @@ check_icon_theme (GtkFileChooserDefault *impl)
if (impl->settings_signal_id)
return;
settings = gtk_settings_get_for_screen (gtk_widget_get_screen (GTK_WIDGET (impl)));
impl->settings_signal_id = g_signal_connect (settings, "notify",
G_CALLBACK (settings_notify_cb), impl);
if (gtk_widget_has_screen (GTK_WIDGET (impl)))
{
settings = gtk_settings_get_for_screen (gtk_widget_get_screen (GTK_WIDGET (impl)));
impl->settings_signal_id = g_signal_connect (settings, "notify",
G_CALLBACK (settings_notify_cb), impl);
change_icon_theme (impl);
change_icon_theme (impl);
}
}
static void