summaryrefslogtreecommitdiff
path: root/x11/controlcenter/patches/patch-af
blob: 0f3e88addd9fa2ccfb5561f2369690e674a0361b (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
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 "