[maemo-commits] [maemo-commits] r15257 - in projects/haf/trunk/gtk+: . gtk

[From: subversion at stage.maemo.org]

Author: kris
Date: 2008-03-05 16:02:33 +0200 (Wed, 05 Mar 2008)
New Revision: 15257

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gtk/makegtkalias.pl
Log:
2008-03-05  Kristian Rietveld  <kris at imendio.com>

	* gtk/makegtkalias.pl: update the regexp handling #ifdef to be
	able to handle the MAEMO_CHANGES defines.



Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2008-03-05 12:41:24 UTC (rev 15256)
+++ projects/haf/trunk/gtk+/ChangeLog	2008-03-05 14:02:33 UTC (rev 15257)
@@ -1,5 +1,10 @@
 2008-03-05  Kristian Rietveld  <kris at imendio.com>
 
+	* gtk/makegtkalias.pl: update the regexp handling #ifdef to be
+	able to handle the MAEMO_CHANGES defines.
+
+2008-03-05  Kristian Rietveld  <kris at imendio.com>
+
 	Also committed upstream.  Fixes NB#78691.
 
 	* gtk/gtktreemodelfilter.c (gtk_tree_model_filter_row_inserted):

Modified: projects/haf/trunk/gtk+/gtk/makegtkalias.pl
===================================================================
--- projects/haf/trunk/gtk+/gtk/makegtkalias.pl	2008-03-05 12:41:24 UTC (rev 15256)
+++ projects/haf/trunk/gtk+/gtk/makegtkalias.pl	2008-03-05 14:02:33 UTC (rev 15257)
@@ -83,7 +83,7 @@
       next;
   }
 
-  if ($_ =~ /^\#ifn?def\s+G/)
+  if ($_ =~ /^\#ifn?def\s+[GM]/)
   {
       print $_;