diff options
| author | Michael Natterer <mitch@gimp.org> | 2011-10-22 08:48:13 +0200 |
|---|---|---|
| committer | Michael Natterer <mitch@gimp.org> | 2011-10-22 23:53:55 +0200 |
| commit | 2688ccdbc4c8976ba4f7d681533d70ab9edc8b32 (patch) | |
| tree | ebc5503bb0dc4be70f273bde1499225feb8d0e1b /gtk/gtkquartz.c | |
| parent | 88ad614c735a92f8e0b029e2b5070bf0f8db5016 (diff) | |
| download | gtk+-2688ccdbc4c8976ba4f7d681533d70ab9edc8b32.tar.gz | |
gtk: clean up the private horror
- add gtkmodulesprivate.h and move stuff there from gtkprivate.h
- add gtkprivate.c and move stuff there from gtkmain.c
- add gtkwin32.c and move stuff there from gtkmain.c
- don't redefine GTK_DATADIR and friends in gtkprivate.h
- have _gtk_get_datadir() and friends on all platforms
- remove the horrid hacks where gtkprivate.h can't be included,
or must be included later due to redefinition of the compile-time
directories
Diffstat (limited to 'gtk/gtkquartz.c')
| -rw-r--r-- | gtk/gtkquartz.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/gtk/gtkquartz.c b/gtk/gtkquartz.c index 7f36e9e6a5..74570005cd 100644 --- a/gtk/gtkquartz.c +++ b/gtk/gtkquartz.c @@ -311,8 +311,9 @@ _gtk_quartz_set_selection_data_for_pasteboard (NSPasteboard *pasteboard, forType:type]; } -/* - * Bundle-based functions for various directories. These almost work +#ifdef QUARTZ_RELOCATION + +/* Bundle-based functions for various directories. These almost work * even when the application isn't in a bundle, becuase mainBundle * paths point to the bin directory in that case. It's a simple matter * to test for that and remove the last element. @@ -392,3 +393,5 @@ _gtk_get_data_prefix (void) { return get_bundle_path (); } + +#endif /* QUARTZ_RELOCATION */ |