Mercurial > emacs
comparison src/gtkutil.c @ 112360:3215a5cff4dd
Declare some DEFVARs globally, not locally
* gtkutil.h (x_gtk_use_old_file_dialog, x_gtk_show_hidden_files)
(x_gtk_file_dialog_help_text, x_gtk_whole_detached_tool_bar):
Declare.
* gtkutil.c (xg_uses_old_file_dialog):
(xg_get_file_with_chooser):
(xg_tool_bar_detach_callback): Don't redeclare globals.
author | Tom Tromey <tromey@redhat.com> |
---|---|
date | Tue, 18 Jan 2011 10:28:28 -0700 |
parents | ef719132ddfa |
children | 9de5a68b57e1 |
comparison
equal
deleted
inserted
replaced
112359:011b1eb5c384 | 112360:3215a5cff4dd |
---|---|
1534 | 1534 |
1535 int | 1535 int |
1536 xg_uses_old_file_dialog (void) | 1536 xg_uses_old_file_dialog (void) |
1537 { | 1537 { |
1538 #ifdef HAVE_GTK_FILE_SELECTION_NEW | 1538 #ifdef HAVE_GTK_FILE_SELECTION_NEW |
1539 extern int x_gtk_use_old_file_dialog; | |
1540 return x_gtk_use_old_file_dialog; | 1539 return x_gtk_use_old_file_dialog; |
1541 #else | 1540 #else |
1542 return 0; | 1541 return 0; |
1543 #endif | 1542 #endif |
1544 } | 1543 } |
1575 changes that property by right clicking in the file list. */ | 1574 changes that property by right clicking in the file list. */ |
1576 | 1575 |
1577 static void | 1576 static void |
1578 xg_toggle_notify_cb (GObject *gobject, GParamSpec *arg1, gpointer user_data) | 1577 xg_toggle_notify_cb (GObject *gobject, GParamSpec *arg1, gpointer user_data) |
1579 { | 1578 { |
1580 extern int x_gtk_show_hidden_files; | |
1581 | |
1582 if (strcmp (arg1->name, "show-hidden") == 0) | 1579 if (strcmp (arg1->name, "show-hidden") == 0) |
1583 { | 1580 { |
1584 GtkWidget *wtoggle = GTK_WIDGET (user_data); | 1581 GtkWidget *wtoggle = GTK_WIDGET (user_data); |
1585 gboolean visible, toggle_on; | 1582 gboolean visible, toggle_on; |
1586 | 1583 |
1624 GtkWidget *filewin, *wtoggle, *wbox, *wmessage; | 1621 GtkWidget *filewin, *wtoggle, *wbox, *wmessage; |
1625 GtkWindow *gwin = GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)); | 1622 GtkWindow *gwin = GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)); |
1626 GtkFileChooserAction action = (mustmatch_p ? | 1623 GtkFileChooserAction action = (mustmatch_p ? |
1627 GTK_FILE_CHOOSER_ACTION_OPEN : | 1624 GTK_FILE_CHOOSER_ACTION_OPEN : |
1628 GTK_FILE_CHOOSER_ACTION_SAVE); | 1625 GTK_FILE_CHOOSER_ACTION_SAVE); |
1629 extern int x_gtk_show_hidden_files; | |
1630 extern int x_gtk_file_dialog_help_text; | |
1631 | |
1632 | 1626 |
1633 if (only_dir_p) | 1627 if (only_dir_p) |
1634 action = GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER; | 1628 action = GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER; |
1635 | 1629 |
1636 filewin = gtk_file_chooser_dialog_new (prompt, gwin, action, | 1630 filewin = gtk_file_chooser_dialog_new (prompt, gwin, action, |
3792 xg_tool_bar_detach_callback (GtkHandleBox *wbox, | 3786 xg_tool_bar_detach_callback (GtkHandleBox *wbox, |
3793 GtkWidget *w, | 3787 GtkWidget *w, |
3794 gpointer client_data) | 3788 gpointer client_data) |
3795 { | 3789 { |
3796 FRAME_PTR f = (FRAME_PTR) client_data; | 3790 FRAME_PTR f = (FRAME_PTR) client_data; |
3797 extern int x_gtk_whole_detached_tool_bar; | |
3798 | 3791 |
3799 g_object_set (G_OBJECT (w), "show-arrow", !x_gtk_whole_detached_tool_bar, | 3792 g_object_set (G_OBJECT (w), "show-arrow", !x_gtk_whole_detached_tool_bar, |
3800 NULL); | 3793 NULL); |
3801 | 3794 |
3802 if (f) | 3795 if (f) |