comparison src/device-gtk.c @ 4982:3c3c1d139863

Automatic merge
author Ben Wing <ben@xemacs.org>
date Fri, 05 Feb 2010 11:25:00 -0600
parents 4aebb0131297 16112448d484
children b5df3737028a 8b2f75cecb89
comparison
equal deleted inserted replaced
4981:4aebb0131297 4982:3c3c1d139863
258 gtk_rc_set_default_files (new_rc_files); 258 gtk_rc_set_default_files (new_rc_files);
259 259
260 for (ctr = 1; new_rc_files[ctr]; ctr++) 260 for (ctr = 1; new_rc_files[ctr]; ctr++)
261 free(new_rc_files[ctr]); 261 free(new_rc_files[ctr]);
262 262
263 xfree (new_rc_files, gchar **); 263 xfree (new_rc_files);
264 } 264 }
265 } 265 }
266 266
267 Fgtk_init (Vgtk_initial_argv_list); 267 Fgtk_init (Vgtk_initial_argv_list);
268 268
354 354
355 #ifndef NEW_GC 355 #ifndef NEW_GC
356 static void 356 static void
357 free_gtk_device_struct (struct device *d) 357 free_gtk_device_struct (struct device *d)
358 { 358 {
359 xfree (d->device_data, void *); 359 xfree (d->device_data);
360 } 360 }
361 #endif /* not NEW_GC */ 361 #endif /* not NEW_GC */
362 362
363 static void 363 static void
364 gtk_delete_device (struct device *d) 364 gtk_delete_device (struct device *d)