aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

updated for version 7.3.506

Browse Source 
Problem:    GTK gives an error when selecting a non-existent file.
Solution:   Add a handler to avoid the error. (Christian Brabandt)
This commit is contained in:
Bram Moolenaar 2012-04-25 17:10:16 +02:00
parent 68a33fc704
commit 68fb5dcd13
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/gui_gtk.c
View File

@ -90,6 +90,11 @@ typedef int GtkWidget;
static void entry_activate_cb(GtkWidget *widget, gpointer data); static void entry_activate_cb(GtkWidget *widget, gpointer data);
static void entry_changed_cb(GtkWidget *entry, GtkWidget *dialog); static void entry_changed_cb(GtkWidget *entry, GtkWidget *dialog);
static void find_replace_cb(GtkWidget *widget, gpointer data); static void find_replace_cb(GtkWidget *widget, gpointer data);
static void recent_func_log_func(
const gchar *log_domain,
GLogLevelFlags log_level,
const gchar *message,
gpointer user_data);
#if defined(FEAT_TOOLBAR) #if defined(FEAT_TOOLBAR)
/* /*
@ -839,6 +844,8 @@ gui_mch_browse(int saving UNUSED,
GtkWidget *fc; GtkWidget *fc;
#endif #endif
char_u dirbuf[MAXPATHL]; char_u dirbuf[MAXPATHL];
guint log_handler;
const gchar *domain = "Gtk";
title = CONVERT_TO_UTF8(title); title = CONVERT_TO_UTF8(title);
@ -853,6 +860,11 @@ gui_mch_browse(int saving UNUSED,
/* If our pointer is currently hidden, then we should show it. */ /* If our pointer is currently hidden, then we should show it. */
gui_mch_mousehide(FALSE); gui_mch_mousehide(FALSE);
/* Hack: The GTK file dialog warns when it can't access a new file, this
* makes it shut up. http://bugzilla.gnome.org/show_bug.cgi?id=664587 */
log_handler = g_log_set_handler(domain, G_LOG_LEVEL_WARNING,
recent_func_log_func, NULL);
#ifdef USE_FILE_CHOOSER #ifdef USE_FILE_CHOOSER
/* We create the dialog each time, so that the button text can be "Open" /* We create the dialog each time, so that the button text can be "Open"
* or "Save" according to the action. */ * or "Save" according to the action. */
@ -916,6 +928,7 @@ gui_mch_browse(int saving UNUSED,
gtk_widget_show(gui.filedlg); gtk_widget_show(gui.filedlg);
gtk_main(); gtk_main();
#endif #endif
g_log_remove_handler(domain, log_handler);
CONVERT_TO_UTF8_FREE(title); CONVERT_TO_UTF8_FREE(title);
if (gui.browse_fname == NULL) if (gui.browse_fname == NULL)
@ -1882,3 +1895,14 @@ ex_helpfind(eap)
* backwards compatibility anyway. */ * backwards compatibility anyway. */
do_cmdline_cmd((char_u *)"emenu ToolBar.FindHelp"); do_cmdline_cmd((char_u *)"emenu ToolBar.FindHelp");
} }
static void
recent_func_log_func(const gchar *log_domain UNUSED,
GLogLevelFlags log_level UNUSED,
const gchar *message UNUSED,
gpointer user_data UNUSED)
{
/* We just want to suppress the warnings. */
/* http://bugzilla.gnome.org/show_bug.cgi?id=664587 */
}

2
src/version.c
View File

@ -714,6 +714,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
506,
/**/ /**/
505, 505,
/**/ /**/