debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Tweak last_folder handling to avoid warnings

Browse source
This commit is contained in:
Christian Dywan 2011-11-20 22:19:08 +01:00
parent 0d2a6cd72f
commit c60a9d220a
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
midori/midori-browser.c
View file

@ -2251,9 +2251,9 @@ _action_open_activate (GtkAction* action,
{ {
#if !GTK_CHECK_VERSION (3, 1, 10) #if !GTK_CHECK_VERSION (3, 1, 10)
static gchar* last_dir = NULL; static gchar* last_dir = NULL;
gboolean folder_set = FALSE;
#endif #endif
gchar* uri = NULL; gchar* uri = NULL;
gboolean folder_set = FALSE;
GtkWidget* dialog; GtkWidget* dialog;
GtkWidget* view; GtkWidget* view;
@ -2274,7 +2274,9 @@ _action_open_activate (GtkAction* action,
if (dirname && g_file_test (dirname, G_FILE_TEST_IS_DIR)) if (dirname && g_file_test (dirname, G_FILE_TEST_IS_DIR))
{ {
gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), dirname); gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), dirname);
#if !GTK_CHECK_VERSION (3, 1, 10)
folder_set = TRUE; folder_set = TRUE;
#endif
} }
g_free (dirname); g_free (dirname);
@ -2289,16 +2291,15 @@ _action_open_activate (GtkAction* action,
if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK) if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK)
{ {
#if !GTK_CHECK_VERSION (3, 1, 10)
gchar* folder; gchar* folder;
folder = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (dialog)); folder = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (dialog));
katze_assign (last_dir, folder);
#endif
uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (dialog)); uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (dialog));
midori_browser_set_current_uri (browser, uri); midori_browser_set_current_uri (browser, uri);
g_free (uri); g_free (uri);
#if !GTK_CHECK_VERSION (3, 1, 10)
katze_assign (last_dir, folder);
#endif
} }
gtk_widget_destroy (dialog); gtk_widget_destroy (dialog);
} }