include config.h

2002-10-26  Havoc Pennington  <hp@pobox.com>

	* src/iconcache.c: include config.h

	* src/group.c: include config.h

	* src/frame.c: include config.h

	* src/core.c: include config.h so it doesn't crash all over the
	place due to #ifdef HAVE_STARTUP_NOTIFICATION

	* src/util.c (meta_print_backtrace): export from this file

	* src/main.c (log_handler): print backtrace here

ChangeLog

@@ -1,3 +1,18 @@
+2002-10-26  Havoc Pennington  <hp@pobox.com>
+
+	* src/iconcache.c: include config.h
+
+	* src/group.c: include config.h
+
+	* src/frame.c: include config.h
+
+	* src/core.c: include config.h so it doesn't crash all over the
+	place due to #ifdef HAVE_STARTUP_NOTIFICATION
+
+	* src/util.c (meta_print_backtrace): export from this file
+
+	* src/main.c (log_handler): print backtrace here
+
 2002-10-26  Havoc Pennington  <hp@pobox.com>
 
 	* src/wm-tester/main.c (evil_timeout): make windows randomly

src/core.c

@@ -19,6 +19,7 @@
  * 02111-1307, USA.
  */
 
+#include <config.h>
 #include "core.h"
 #include "frame.h"
 #include "workspace.h"

src/display.h

@@ -22,6 +22,10 @@
 #ifndef META_DISPLAY_H
 #define META_DISPLAY_H
 
+#ifndef PACKAGE
+#error "config.h not included"
+#endif
+
 #include <glib.h>
 #include <X11/Xlib.h>
 #include "eventqueue.h"
@@ -153,10 +157,6 @@ struct _MetaDisplay
   Atom atom_net_wm_action_close;
   Atom atom_net_wm_state_above;
   Atom atom_net_wm_state_below;
-
-#ifdef HAVE_STARTUP_NOTIFICATION
-  SnDisplay *sn_display;
-#endif
   
   /* This is the actual window from focus events,
    * not the one we last set
@@ -258,6 +258,15 @@ struct _MetaDisplay
 
   /* Managed by group.c */
   GHashTable *groups_by_leader;
+
+  
+#ifdef HAVE_STARTUP_NOTIFICATION
+  /* This is at the end in case someone doesn't include config.h before this file
+   * the results won't be catastrophic
+   */
+  SnDisplay *sn_display;
+#endif
+
 };
 
 gboolean      meta_display_open                (const char  *name);

src/frame.c

@@ -19,6 +19,7 @@
  * 02111-1307, USA.
  */
 
+#include <config.h>
 #include "frame.h"
 #include "errors.h"
 #include "keybindings.h"

src/group.c

@@ -19,6 +19,7 @@
  * 02111-1307, USA.
  */
 
+#include <config.h>
 #include "util.h"
 #include "group.h"
 #include "window.h"

src/iconcache.c

@@ -19,6 +19,7 @@
  * 02111-1307, USA.
  */
 
+#include <config.h>
 #include "iconcache.h"
 #include "ui.h"
 #include "errors.h"

src/main.c

@@ -55,6 +55,7 @@ log_handler (const gchar   *log_domain,
              gpointer       user_data)
 {
   meta_warning ("Log level %d: %s\n", log_level, message);
+  meta_print_backtrace ();
 }
 
 static void

src/metacity.desktop.in

@@ -1,6 +1,11 @@
 [Desktop Entry]
 _Name=Metacity
 Exec=metacity
+# name of loadable control center module
+X-GNOME-WMSettingsModule=metacity
+# name we put on the WM spec check window
+X-GNOME-WMName=Metacity
+# back compat only 
 X-GnomeWMSettingsLibrary=metacity
 
 [Window Manager]

src/stack.c

@@ -20,6 +20,7 @@
  * 02111-1307, USA.
  */
 
+#include <config.h>
 #include "stack.h"
 #include "window.h"
 #include "errors.h"

src/util.c

@@ -31,8 +31,8 @@
 
 #ifdef HAVE_BACKTRACE
 #include <execinfo.h>
-static void
-print_backtrace (void)
+void
+meta_print_backtrace (void)
 {
   void *bt[500];
   int bt_size;
@@ -53,8 +53,8 @@ print_backtrace (void)
   free (syms);
 }
 #else
-static void
-print_backtrace (void)
+void
+meta_print_backtrace (void)
 {
   meta_verbose ("Not compiled with backtrace support\n");
 }
@@ -317,7 +317,7 @@ meta_bug (const char *format, ...)
   
   g_free (str);
 
-  print_backtrace ();
+  meta_print_backtrace ();
   
   /* stop us in a debugger */
   abort ();

src/util.h

@@ -76,6 +76,8 @@ gint  meta_unsigned_long_equal (gconstpointer v1,
                                 gconstpointer v2);
 guint meta_unsigned_long_hash  (gconstpointer v);
 
+void meta_print_backtrace (void);
+
 #include <libintl.h>
 #define _(x) dgettext (GETTEXT_PACKAGE, x)
 #define N_(x) x