projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
From http://www.jwz.org/xscreensaver/xscreensaver-5.33.tar.gz
[xscreensaver]
/
driver
/
demo-Gtk.c
diff --git
a/driver/demo-Gtk.c
b/driver/demo-Gtk.c
index c8a19cd391dfa01714b9b74939b510a825ae766d..27d2316d2c494e68d2eaa65e253364ab3af846af 100644
(file)
--- a/
driver/demo-Gtk.c
+++ b/
driver/demo-Gtk.c
@@
-123,11
+123,6
@@
#include "logo-50.xpm"
#include "logo-180.xpm"
#include "logo-50.xpm"
#include "logo-180.xpm"
-#undef dgettext /* else these are defined twice... */
-#undef dcgettext
-
-#include "demo-Gtk-widgets.h"
-#include "demo-Gtk-support.h"
#include "demo-Gtk-conf.h"
#include <stdio.h>
#include "demo-Gtk-conf.h"
#include <stdio.h>
@@
-1562,7
+1557,7
@@
flush_dialog_changes_and_save (state *s)
# define TEXT(FIELD,NAME) \
w = name_to_widget (s, (NAME)); \
# define TEXT(FIELD,NAME) \
w = name_to_widget (s, (NAME)); \
- (FIELD) = (char *) g
tk_entry_get_text (GTK_ENTRY (w
))
+ (FIELD) = (char *) g
_strdup(gtk_entry_get_text (GTK_ENTRY (w)
))
MINUTES (&p2->timeout, "timeout_spinbutton");
MINUTES (&p2->cycle, "cycle_spinbutton");
MINUTES (&p2->timeout, "timeout_spinbutton");
MINUTES (&p2->cycle, "cycle_spinbutton");
@@
-4721,7
+4716,7
@@
delayed_scroll_kludge (gpointer data)
#ifdef HAVE_GTK2
#ifdef HAVE_GTK2
-GtkWidget *
+
static
GtkWidget *
create_xscreensaver_demo (void)
{
GtkWidget *nb;
create_xscreensaver_demo (void)
{
GtkWidget *nb;
@@
-4732,7
+4727,7
@@
create_xscreensaver_demo (void)
return name_to_widget (global_state_kludge, "xscreensaver_demo");
}
return name_to_widget (global_state_kludge, "xscreensaver_demo");
}
-GtkWidget *
+
static
GtkWidget *
create_xscreensaver_settings_dialog (void)
{
GtkWidget *w, *box;
create_xscreensaver_settings_dialog (void)
{
GtkWidget *w, *box;