mirror of the now-defunct rocklinux.org
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

97 lines
3.6 KiB

  1. --- ./capplet/main.c.orig 2004-09-07 03:06:36.943155280 +0200
  2. +++ ./capplet/main.c 2004-09-07 03:08:57.265822992 +0200
  3. @@ -22,7 +22,7 @@
  4. #include <config.h>
  5. #include <gnome.h>
  6. -#include <capplet-widget.h>
  7. +// #include <capplet-widget.h>
  8. #include <gtkhtml-properties.h>
  9. #include <glade/glade.h>
  10. #include "gnome-bindings-prop.h"
  11. @@ -33,7 +33,7 @@
  12. #define XEMACS_KEYMAP_NAME "XEmacs like"
  13. #define MS_KEYMAP_NAME "MS like"
  14. -static GtkWidget *capplet, *variable, *variable_print, *fixed, *fixed_print, *anim_check;
  15. +static GtkWidget *variable, *variable_print, *fixed, *fixed_print, *anim_check;
  16. static GtkWidget *bi, *live_spell_check, *live_spell_frame, *magic_links_check, *magic_smileys_check, *button_cfg_spell;
  17. static gboolean active = FALSE;
  18. @@ -202,8 +202,8 @@
  19. static void
  20. changed (GtkWidget *widget, gpointer null)
  21. {
  22. - if (active)
  23. - capplet_widget_state_changed (CAPPLET_WIDGET (capplet), TRUE);
  24. + // if (active)
  25. + // capplet_widget_state_changed (CAPPLET_WIDGET (capplet), TRUE);
  26. }
  27. static void
  28. @@ -255,7 +255,7 @@
  29. glade_xml_signal_connect (xml, "changed", GTK_SIGNAL_FUNC (changed));
  30. glade_xml_signal_connect (xml, "live_changed", GTK_SIGNAL_FUNC (live_changed));
  31. - capplet = capplet_widget_new();
  32. + // capplet = capplet_widget_new();
  33. vbox = glade_xml_get_widget (xml, "prefs_widget");
  34. variable = glade_xml_get_widget (xml, "screen_variable");
  35. @@ -315,8 +315,8 @@
  36. ebox = glade_xml_get_widget (xml, "bindings_ebox");
  37. gtk_container_add (GTK_CONTAINER (ebox), bi);
  38. - gtk_container_add (GTK_CONTAINER (capplet), vbox);
  39. - gtk_widget_show_all (capplet);
  40. + // gtk_container_add (GTK_CONTAINER (capplet), vbox);
  41. + // gtk_widget_show_all (capplet);
  42. set_ui ();
  43. }
  44. @@ -327,7 +327,7 @@
  45. bindtextdomain (PACKAGE, GNOMELOCALEDIR);
  46. textdomain (PACKAGE);
  47. - if (gnome_capplet_init ("gtkhtml-properties", VERSION, argc, argv, NULL, 0, NULL) < 0)
  48. + // if (gnome_capplet_init ("gtkhtml-properties", VERSION, argc, argv, NULL, 0, NULL) < 0)
  49. return 1;
  50. #ifdef GTKHTML_HAVE_GCONF
  51. @@ -354,16 +354,16 @@
  52. setup ();
  53. /* connect signals */
  54. - gtk_signal_connect (GTK_OBJECT (capplet), "try",
  55. - GTK_SIGNAL_FUNC (apply), NULL);
  56. - gtk_signal_connect (GTK_OBJECT (capplet), "revert",
  57. - GTK_SIGNAL_FUNC (revert), NULL);
  58. - gtk_signal_connect (GTK_OBJECT (capplet), "ok",
  59. - GTK_SIGNAL_FUNC (apply), NULL);
  60. - gtk_signal_connect (GTK_OBJECT (capplet), "cancel",
  61. - GTK_SIGNAL_FUNC (revert), NULL);
  62. + // gtk_signal_connect (GTK_OBJECT (capplet), "try",
  63. + // GTK_SIGNAL_FUNC (apply), NULL);
  64. + // gtk_signal_connect (GTK_OBJECT (capplet), "revert",
  65. + // GTK_SIGNAL_FUNC (revert), NULL);
  66. + // gtk_signal_connect (GTK_OBJECT (capplet), "ok",
  67. + // GTK_SIGNAL_FUNC (apply), NULL);
  68. + // gtk_signal_connect (GTK_OBJECT (capplet), "cancel",
  69. + // GTK_SIGNAL_FUNC (revert), NULL);
  70. - capplet_gtk_main ();
  71. + // capplet_gtk_main ();
  72. /* g_free (home_rcfile); */
  73. --- ./configure.orig 2004-09-07 02:52:30.873777376 +0200
  74. +++ ./configure 2004-09-07 02:52:57.504728856 +0200
  75. @@ -7665,7 +7665,7 @@
  76. pkgvers=`echo $pkgvers | awk -F. '{ print $1 * 1000000 + $2 * 10000 + $3 * 100 + $4;}'`
  77. - if test "$pkgvers" -lt $cmpvers; then
  78. + if false && test "$pkgvers" -lt $cmpvers; then
  79. { echo "configure: error:
  80. ""
  81. "You need $dispname $dispvers or later to build $PACKAGE."" 1>&2; exit 1; }