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.

61 lines
2.5 KiB

  1. # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
  2. #
  3. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  4. # Please add additional copyright information _after_ the line containing
  5. # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
  6. # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
  7. #
  8. # ROCK Linux: rock-src/package/gnome2/rep-gtk/no_double_definitions.patch
  9. # ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
  10. #
  11. # This patch file is dual-licensed. It is available under the license the
  12. # patched project is licensed under, as long as it is an OpenSource license
  13. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  14. # of the GNU General Public License as published by the Free Software
  15. # Foundation; either version 2 of the License, or (at your option) any later
  16. # version.
  17. #
  18. # --- ROCK-COPYRIGHT-NOTE-END ---
  19. diff -dur rep-gtk-0.18/gtk-compat.c src.rep-gtk.1100023779.22603.1788690224/rep-gtk-0.18/gtk-compat.c
  20. --- rep-gtk-0.18/gtk-compat.c 2002-07-12 06:19:22.000000000 +0200
  21. +++ src.rep-gtk.1100023779.22603.1788690224/rep-gtk-0.18/gtk-compat.c 2004-11-09 19:26:34.955192600 +0100
  22. @@ -63,22 +63,6 @@
  23. }
  24. GtkWidget*
  25. -gtk_radio_menu_item_new_with_label_from_widget (GtkRadioMenuItem *group,
  26. - gchar *label)
  27. -{
  28. - GSList *g = group? gtk_radio_menu_item_group (group) : NULL;
  29. - return gtk_radio_menu_item_new_with_label (g, label);
  30. -}
  31. -
  32. -GtkWidget*
  33. -gtk_radio_menu_item_new_with_mnemonic_from_widget (GtkRadioMenuItem *group,
  34. - gchar *label)
  35. -{
  36. - GSList *g = group? gtk_radio_menu_item_group (group) : NULL;
  37. - return gtk_radio_menu_item_new_with_mnemonic (g, label);
  38. -}
  39. -
  40. -GtkWidget*
  41. gtk_radio_menu_item_new_from_widget (GtkRadioMenuItem *group)
  42. {
  43. GSList *g = group? gtk_radio_menu_item_group (group) : NULL;
  44. diff -dur rep-gtk-0.18/rep-gtk.h src.rep-gtk.1100023779.22603.1788690224/rep-gtk-0.18/rep-gtk.h
  45. --- rep-gtk-0.18/rep-gtk.h 2003-02-12 09:51:45.000000000 +0100
  46. +++ src.rep-gtk.1100023779.22603.1788690224/rep-gtk-0.18/rep-gtk.h 2004-11-09 19:24:21.553472744 +0100
  47. @@ -289,12 +289,6 @@
  48. guint32 activate_time,
  49. repv position);
  50. -GtkWidget*
  51. -gtk_radio_menu_item_new_with_label_from_widget (GtkRadioMenuItem *group,
  52. - gchar *label);
  53. -GtkWidget*
  54. -gtk_radio_menu_item_new_with_mnemonic_from_widget (GtkRadioMenuItem *group,
  55. - gchar *label);
  56. GtkWidget* gtk_radio_menu_item_new_from_widget (GtkRadioMenuItem *group);
  57. GtkWidget* gtk_pixmap_new_interp (char *file, GtkWidget *intended_parent);