1 ? rgpe-conf-0.1.22-20041124.patch
3 ===================================================================
4 RCS file: /cvs/gpe/base/gpe-conf/ChangeLog,v
5 retrieving revision 1.268
6 retrieving revision 1.270
7 diff -u -r1.268 -r1.270
8 --- ChangeLog 23 Nov 2004 21:34:38 -0000 1.268
9 +++ ChangeLog 24 Nov 2004 15:44:10 -0000 1.270
11 2004-11-23 Florian Boor <florian.boor@kernelconcepts.de>
13 + * cfgfile.*, network.c: Hide all network interfaces that are not available.
15 +2004-11-19 Florian Boor <florian.boor@kernelconcepts.de>
17 + * users/interface.*, users/callbacks.c: Prevent user from deleting last
19 + * timeanddate.c: Make some entries activate OK button.
21 +2004-11-23 Florian Boor <florian.boor@kernelconcepts.de>
23 * Released Version 0.1.22
25 2004-11-17 Florian Boor <florian.boor@kernelconcepts.de>
27 ===================================================================
28 RCS file: /cvs/gpe/base/gpe-conf/cfgfile.c,v
29 retrieving revision 1.14
30 retrieving revision 1.15
32 --- cfgfile.c 16 Oct 2004 16:03:42 -0000 1.14
33 +++ cfgfile.c 24 Nov 2004 15:43:10 -0000 1.15
37 #include <gpe/errorbox.h>
39 +#include <sys/socket.h>
43 +#include "tools/interface.h"
45 #define _(x) gettext(x)
52 +is_present_interface(gchar *ifname)
54 + struct interface *int_list, *ife;
56 + int_list = if_getlist ();
59 + for (ife = int_list; ife; ife = ife->next)
61 + if (g_str_has_prefix(ifname, ife->name))
67 gint get_scheme_list()
69 gchar ifname[255] = {0};
71 memset(&iflist[l-1],'\0',sizeof(NWInterface_t));
73 strcpy(iflist[l-1].name,ifname);
74 + iflist[l-1].ispresent = is_present_interface(ifname);
76 iflist[l-1].isstatic = FALSE;
77 iflist[l-1].isinet = FALSE;
79 ===================================================================
80 RCS file: /cvs/gpe/base/gpe-conf/cfgfile.h,v
81 retrieving revision 1.9
82 retrieving revision 1.10
84 --- cfgfile.h 25 Aug 2004 10:17:31 -0000 1.9
85 +++ cfgfile.h 24 Nov 2004 15:43:10 -0000 1.10
93 gint set_file_open(gint openon);
95 ===================================================================
96 RCS file: /cvs/gpe/base/gpe-conf/network.c,v
97 retrieving revision 1.42
98 retrieving revision 1.43
100 --- network.c 17 Nov 2004 18:25:59 -0000 1.42
101 +++ network.c 24 Nov 2004 15:43:10 -0000 1.43
102 @@ -1648,12 +1648,15 @@
103 for (row = 0; row < num_int; row++)
106 - if (iflist[row].isstatic)
107 - ctable = create_nwstatic_widgets (iflist[row]);
108 - if (iflist[row].isdhcp)
109 - ctable = create_nwdhcp_widgets (iflist[row]);
110 - if (iflist[row].isppp)
111 - ctable = create_nwppp_widgets (iflist[row]);
112 + if (iflist[row].ispresent)
114 + if (iflist[row].isstatic)
115 + ctable = create_nwstatic_widgets (iflist[row]);
116 + if (iflist[row].isdhcp)
117 + ctable = create_nwdhcp_widgets (iflist[row]);
118 + if (iflist[row].isppp)
119 + ctable = create_nwppp_widgets (iflist[row]);
125 ===================================================================
126 RCS file: /cvs/gpe/base/gpe-conf/timeanddate.c,v
127 retrieving revision 1.39
128 retrieving revision 1.40
129 diff -u -r1.39 -r1.40
130 --- timeanddate.c 6 Nov 2004 08:22:52 -0000 1.39
131 +++ timeanddate.c 24 Nov 2004 15:43:10 -0000 1.40
133 gtk_misc_set_alignment (GTK_MISC (self.catlabel1), 0.0, 0.9);
135 self.cal = gtk_date_combo_new ();
136 + gtk_entry_set_activates_default(GTK_ENTRY(GTK_DATE_COMBO(self.cal)->entry), TRUE);
137 gtk_calendar_select_month (GTK_CALENDAR (GTK_DATE_COMBO(self.cal)->cal), ts.tm_mon, ts.tm_year);
138 gtk_calendar_select_day (GTK_CALENDAR (GTK_DATE_COMBO(self.cal)->cal), ts.tm_mday);
139 gtk_table_attach (GTK_TABLE (table), self.cal, 0, 3, 1, 2,
141 gpe_time_sel_set_time(GPE_TIME_SEL(self.tsel),(guint)ts.tm_hour, (guint)ts.tm_min);
142 gtk_table_attach (GTK_TABLE (table), self.tsel, 0, 3, 3, 4,
144 + gtk_entry_set_activates_default(GTK_ENTRY(GPE_TIME_SEL(self.tsel)->hour_spin), TRUE);
145 + gtk_entry_set_activates_default(GTK_ENTRY(GPE_TIME_SEL(self.tsel)->minute_spin), TRUE);
146 /* -------------------------------------------------------------------------- */
148 self.catlabel3 = gtk_label_new (NULL);
150 gtk_combo_set_popdown_strings (GTK_COMBO (self.ntpserver), ntpsrv);
151 gtk_table_attach (GTK_TABLE (table), self.ntpserver, 0, 3, 5, 6,
155 gtk_tooltips_set_tip (tooltips, self.ntpserver, _("Select the timeserver to use to set the clock."), NULL);
157 self.internet = gtk_button_new_with_label(_("Get time from network"));
158 Index: users/callbacks.c
159 ===================================================================
160 RCS file: /cvs/gpe/base/gpe-conf/users/callbacks.c,v
161 retrieving revision 1.17
162 retrieving revision 1.18
163 diff -u -r1.17 -r1.18
164 --- users/callbacks.c 17 Nov 2004 18:26:00 -0000 1.17
165 +++ users/callbacks.c 24 Nov 2004 15:43:10 -0000 1.18
167 pwlist *cur = pwroot;
168 pwlist **prec = &pwroot;
169 uint i=GPOINTER_TO_UINT(tmp->data);
170 + uint usercount = 0;
174 + if ((cur->pw.pw_uid >= MINUSERUID) && (cur->pw.pw_uid < MAXUSERID))
181 + gpe_error_box(_("You need at least one user account!"));
194 + if (!strcmp(cur->pw.pw_name, "lx"))
196 + gpe_error_box(_("You can't remove this user!"));
200 if(cur->pw.pw_uid < MINUSERUID)
201 gpe_error_box(_("You can't remove\n system users!"));
211 Index: users/interface.h
212 ===================================================================
213 RCS file: /cvs/gpe/base/gpe-conf/users/interface.h,v
214 retrieving revision 1.8
215 retrieving revision 1.9
217 --- users/interface.h 14 Jun 2004 10:15:16 -0000 1.8
218 +++ users/interface.h 24 Nov 2004 15:43:10 -0000 1.9
221 #define MINUSERUID 100
223 +#define MAXUSERID 65500
225 typedef struct pwlist_s