r4095 - trunk/birnet

[timj svn gnome org]

Author: timj
Date: 2006-11-22 13:47:46 -0500 (Wed, 22 Nov 2006)
New Revision: 4095

Modified:
   trunk/birnet/ChangeLog
   trunk/birnet/birnetcdefs.h
   trunk/birnet/birnetutils.cc
Log:
Wed Nov 22 19:45:21 2006  Tim Janik  <timj gtk org>                                                                                                           
                                                                                                                                                              
        * birnetutils.cc (url_test_show): prefer configurable browser launchers                                                                               
        over non-configurable browser launchers.                                                                                                              
                                                                                                                                                              
        * birnetcdefs.h: provide EXTERN_C and BIRNET_MAY_ALIAS.                                                                                               
                                                                                                                                                              



Modified: trunk/birnet/ChangeLog
===================================================================
--- trunk/birnet/ChangeLog	2006-11-21 21:25:55 UTC (rev 4094)
+++ trunk/birnet/ChangeLog	2006-11-22 18:47:46 UTC (rev 4095)
@@ -1,3 +1,10 @@
+Wed Nov 22 19:45:21 2006  Tim Janik  <timj gtk org>
+
+	* birnetutils.cc (url_test_show): prefer configurable browser launchers
+	over non-configurable browser launchers.
+
+	* birnetcdefs.h: provide EXTERN_C and BIRNET_MAY_ALIAS.
+
 Tue Nov 21 22:04:15 2006  Tim Janik  <timj gtk org>
 
 	* birnetutils.cc: reworked browser launching logic to work around

Modified: trunk/birnet/birnetcdefs.h
===================================================================
--- trunk/birnet/birnetcdefs.h	2006-11-21 21:25:55 UTC (rev 4094)
+++ trunk/birnet/birnetcdefs.h	2006-11-22 18:47:46 UTC (rev 4095)
@@ -48,6 +48,12 @@
 #define CLAMP                                   BIRNET_CLAMP
 #undef ARRAY_SIZE
 #define ARRAY_SIZE				BIRNET_ARRAY_SIZE
+#undef EXTERN_C
+#ifdef	__cplusplus
+#define EXTERN_C                                extern "C"
+#else
+#define EXTERN_C                                extern
+#endif
 #undef STRFUNC
 #if defined (__GNUC__)
 #  define STRFUNC				((const char*) (__PRETTY_FUNCTION__))
@@ -111,6 +117,7 @@
 #define BIRNET_ALWAYS_INLINE			__attribute__ ((always_inline))
 #define BIRNET_NEVER_INLINE			__attribute__ ((noinline))
 #define BIRNET_CONSTRUCTOR			__attribute__ ((constructor,used)) /* gcc-3.3 also needs "used" to emit code */
+#define BIRNET_MAY_ALIAS                        __attribute__ ((may_alias))
 #else   /* !__GNUC__ */
 #define BIRNET_PRETTY_FUNCTION                  ("<unknown>")
 #define BIRNET_PURE
@@ -126,6 +133,7 @@
 #define BIRNET_ALWAYS_INLINE
 #define BIRNET_NEVER_INLINE
 #define BIRNET_CONSTRUCTOR
+#define BIRNET_MAY_ALIAS
 #error  Failed to detect a recent GCC version (>= 3.3)
 #endif  /* !__GNUC__ */
 #ifdef	__cplusplus

Modified: trunk/birnet/birnetutils.cc
===================================================================
--- trunk/birnet/birnetutils.cc	2006-11-21 21:25:55 UTC (rev 4094)
+++ trunk/birnet/birnetutils.cc	2006-11-22 18:47:46 UTC (rev 4095)
@@ -1057,10 +1057,11 @@
     volatile bool disabled;
   } www_browsers[] = {
     /* program */               /* arg1 */      /* prefix+URL+postfix */
-    /* working browser launchers */
+    /* configurable, working browser launchers */
     { "gnome-open",             NULL,           "", "", 0 }, /* opens in background, correct exit_code */
+    { "exo-open",               NULL,           "", "", 0 }, /* opens in background, correct exit_code */
+    /* non-configurable working browser launchers */
     { "kfmclient",              "openURL",      "", "", 0 }, /* opens in background, correct exit_code */
-    { "exo-open",               NULL,           "", "", 0 }, /* opens in background, correct exit_code */
     { "gnome-moz-remote",       "--newwin",     "", "", 0 }, /* opens in background, correct exit_code */
 #if 0
     /* broken/unpredictable browser launchers */