diff options
| author | fredb <fredb> | 2002-03-23 22:28:29 +0000 |
|---|---|---|
| committer | fredb <fredb> | 2002-03-23 22:28:29 +0000 |
| commit | 30a6a7134a2094ddaf2af828039b1977062962ff (patch) | |
| tree | a23f87f50094e7d4ed68b2f813f1649fa66e7576 /x11/controlcenter | |
| parent | fa311bae402c4d762d8beef8eaec92a04ae30310 (diff) | |
| download | pkgsrc-30a6a7134a2094ddaf2af828039b1977062962ff.tar.gz | |
Fix a crashing bug in the background properties capplet, and while we're
in here, clean up some gcc warning.
Diffstat (limited to 'x11/controlcenter')
| -rw-r--r-- | x11/controlcenter/distinfo | 3 | ||||
| -rw-r--r-- | x11/controlcenter/patches/patch-af | 38 |
2 files changed, 40 insertions, 1 deletions
diff --git a/x11/controlcenter/distinfo b/x11/controlcenter/distinfo index 5979c934b81..e2d55b2ac2a 100644 --- a/x11/controlcenter/distinfo +++ b/x11/controlcenter/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2002/03/23 04:54:13 fredb Exp $ +$NetBSD: distinfo,v 1.4 2002/03/23 22:28:29 fredb Exp $ SHA1 (control-center-1.4.0.1.tar.gz) = f1b8f9103f5be4ba916f629eaf47663427a97a68 Size (control-center-1.4.0.1.tar.gz) = 3032482 bytes @@ -7,3 +7,4 @@ SHA1 (patch-ab) = 7c5bb9b267dda50de16586dc8074abb9485d8e67 SHA1 (patch-ac) = f2d952d26c383a47cd6ac8dfc061946bf74b5fbc SHA1 (patch-ad) = df1e1ee9ee03a627e3f7b9106b5747648254570e SHA1 (patch-ae) = a8c99df3de1831326182f0812c184ba24df153a1 +SHA1 (patch-af) = fa276788e2ff16fd82674c7031b8ed806cc37ddf diff --git a/x11/controlcenter/patches/patch-af b/x11/controlcenter/patches/patch-af new file mode 100644 index 00000000000..0f3e88addd9 --- /dev/null +++ b/x11/controlcenter/patches/patch-af @@ -0,0 +1,38 @@ +$NetBSD: patch-af,v 1.1 2002/03/23 22:28:29 fredb Exp $ + +--- capplets/background-properties/app-background.c.orig Wed Nov 8 23:11:17 2000 ++++ capplets/background-properties/app-background.c +@@ -7,13 +7,13 @@ + #include <locale.h> + + extern void background_init(void); ++extern void background_properties_init(void); + + static gchar *background_image = NULL; + +-const struct poptOption options [] = { +- { "background-image", 'b', POPT_ARG_STRING, &background_image, 0, +- N_("Set background image."), N_("IMAGE-FILE") }, +- {NULL, '\0', 0, NULL, 0} ++static struct poptOption options = { ++ "background-image", 'b', POPT_ARG_STRING, &background_image, 0, ++ N_("Set background image."), N_("IMAGE-FILE"), + }; + + gint +@@ -24,14 +24,13 @@ + gchar *session_args[3]; + int token, init_results; + poptContext ctx; +- char **args; + + setlocale(LC_ALL, ""); + bindtextdomain (PACKAGE, GNOMELOCALEDIR); + textdomain (PACKAGE); + + init_results = gnome_capplet_init("background-properties", VERSION, +- argc, argv, options, 0, &ctx); ++ argc, argv, &options, 0, &ctx); + gnome_window_icon_set_default_from_file (GNOME_ICONDIR"/gnome-ccbackground.png"); + if (init_results < 0) { + g_warning (_("an initialization error occurred while " |