2.25.21 release.

svn path=/trunk/; revision=4046

ChangeLog

@@ -1,3 +1,31 @@
+2008-12-01  Thomas Thurman  <tthurman@gnome.org>
+
+        * NEWS: 2.25.21 release.
+
+2008-12-01  Thomas Thurman  <tthurman@gnome.org>
+
+	* configure.in: gnome-doc-tools version doesn't need to be so high.
+	* src/compositor/compositor-xrender.c: disable the entire file if the
+          compositor is disabled.
+	* src/core/async-getprop.[ch]: fixes for -Wall
+	* src/core/iconcache.c: fixes for -Wall
+	* src/core/testasyncgetprop.c: fixes for -Wall
+	* src/core/xprops.c: fixes for -Wall
+
+2008-11-26  Thomas Thurman  <tthurman@gnome.org>
+
+	* tools/announce-wrangler.py: linked language codes to po files
+	* tools/commit-wrangler.py: print revision url
+
+2008-11-26  Thomas Thurman  <tthurman@gnome.org>
+
+	* tools/announce-wrangler.py: renamed ini file
+	* tools/commit-wrangler.py: rewriting in terms of moap
+
+2008-11-25  Thomas Thurman  <tthurman@gnome.org>
+
+        * configure.in: Post-release bump to 2.25.21.
+
 2008-11-25  Thomas Thurman  <tthurman@gnome.org>
 
         * NEWS: 2.25.13 release.

NEWS

@@ -1,3 +1,15 @@
+2.25.21
+=======
+
+Thanks to Thomas Thurman for improvements in this version.
+
+  - Fixes to allow building without compositor again (Thomas)
+  - Fixes for -Wall problems (Thomas)
+  - Various tool updates (Thomas)
+
+Translations: none
+
+
 2.25.13
 =======
 

configure.in

@@ -4,7 +4,7 @@ m4_define([metacity_major_version], [2])
 m4_define([metacity_minor_version], [25])
 # Fibonacci sequence for micro version numbering:
 # 0, 1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144, 233, 377, 610, 987
-m4_define([metacity_micro_version], [13])
+m4_define([metacity_micro_version], [21])
 
 m4_define([metacity_version],
           [metacity_major_version.metacity_minor_version.metacity_micro_version])
@@ -231,7 +231,7 @@ fi
 
 if test x$have_xcomposite = xyes; then
   METACITY_PC_MODULES="$METACITY_PC_MODULES xcomposite >= $XCOMPOSITE_VERSION xfixes xrender xdamage"
-  AC_DEFINE(HAVE_COMPOSITE_EXTENSIONS, , [Building with compositing manager support])
+  AC_DEFINE(HAVE_COMPOSITE_EXTENSIONS, 1, [Building with compositing manager support])
   echo "Building with compositing manager"
 
   ## force on render also
@@ -487,7 +487,7 @@ fi
 CFLAGS="$CFLAGS -Wall -Werror -ansi"
 
 # Use gnome-doc-utils:
-GNOME_DOC_INIT([0.9.0])
+GNOME_DOC_INIT([0.8.0])
 
 AC_CONFIG_FILES([
 Makefile

src/compositor/compositor-xrender.c

@@ -26,6 +26,8 @@
 
 #include <config.h>
 
+#ifdef HAVE_COMPOSITE_EXTENSIONS
+
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
@@ -3071,3 +3073,6 @@ meta_compositor_xrender_new (MetaDisplay *display)
   return NULL;
 #endif
 }
+
+#endif /* HAVE_COMPOSITE_EXTENSIONS */
+

src/core/async-getprop.c

@@ -586,7 +586,7 @@ ag_task_get_reply_and_free (AgGetPropertyTask  *task,
                             int                *actual_format,
                             unsigned long      *nitems,
                             unsigned long      *bytesafter,
-                            char              **prop)
+                            unsigned char     **prop)
 {
   Display *dpy;
 
@@ -615,7 +615,7 @@ ag_task_get_reply_and_free (AgGetPropertyTask  *task,
   *nitems = task->n_items;
   *bytesafter = task->bytes_after;
 
-  *prop = task->data; /* pass out ownership of task->data */
+  *prop = (unsigned char*) task->data; /* pass out ownership of task->data */
 
   SyncHandle ();
 

src/core/async-getprop.h

@@ -47,7 +47,7 @@ Status             ag_task_get_reply_and_free (AgGetPropertyTask  *task,
                                                int                *actual_format,
                                                unsigned long      *nitems,
                                                unsigned long      *bytesafter,
-                                               char              **prop);
+                                               unsigned char     **prop);
 
 Bool     ag_task_have_reply   (AgGetPropertyTask *task);
 Atom     ag_task_get_property (AgGetPropertyTask *task);

src/core/iconcache.c

@@ -225,11 +225,12 @@ read_rgb_icon (MetaDisplay   *display,
   gulong nitems;
   gulong bytes_after;
   int result, err;
-  gulong *data;
+  guchar *data;
   gulong *best;
   int w, h;
   gulong *best_mini;
   int mini_w, mini_h;
+  gulong *data_as_long = (gulong*) data;
 
   meta_error_trap_push_with_return (display);
   type = None;
@@ -239,8 +240,7 @@ read_rgb_icon (MetaDisplay   *display,
                                display->atom__NET_WM_ICON,
 			       0, G_MAXLONG,
 			       False, XA_CARDINAL, &type, &format, &nitems,
-			       &bytes_after, ((guchar **)&data));
-
+			       &bytes_after, &data);
   err = meta_error_trap_pop_with_return (display, TRUE);
 
   if (err != Success ||
@@ -253,7 +253,7 @@ read_rgb_icon (MetaDisplay   *display,
       return FALSE;
     }
 
-  if (!find_best_size (data, nitems,
+  if (!find_best_size (data_as_long, nitems,
                        ideal_width, ideal_height,
                        &w, &h, &best))
     {
@@ -261,7 +261,7 @@ read_rgb_icon (MetaDisplay   *display,
       return FALSE;
     }
 
-  if (!find_best_size (data, nitems,
+  if (!find_best_size (data_as_long, nitems,
                        ideal_mini_width, ideal_mini_height,
                        &mini_w, &mini_h, &best_mini))
     {
@@ -464,7 +464,8 @@ get_kwm_win_icon (MetaDisplay *display,
   int format;
   gulong nitems;
   gulong bytes_after;
-  Pixmap *icons;
+  guchar *data;
+  Pixmap *icons = (Pixmap*) icons;
   int err, result;
 
   *pixmap = None;
@@ -478,7 +479,7 @@ get_kwm_win_icon (MetaDisplay *display,
 			       False,
                                display->atom__KWM_WIN_ICON,
 			       &type, &format, &nitems,
-			       &bytes_after, (guchar **)&icons);
+			       &bytes_after, &data);
 
   err = meta_error_trap_pop_with_return (display, TRUE);
   if (err != Success ||

src/core/testasyncgetprop.c

@@ -187,7 +187,7 @@ try_get_reply (Display           *xdisplay,
       int actual_format;
       unsigned long n_items;
       unsigned long bytes_after;
-      char *data;
+      unsigned char *data;
       char *name;
       struct timeval current_time;
 
@@ -421,7 +421,7 @@ run_speed_comparison (Display *xdisplay,
           int actual_format;
           unsigned long n_items;
           unsigned long bytes_after;
-          char *data;
+          unsigned char *data;
 
           assert (ag_task_have_reply (task));
           

src/core/xprops.c

@@ -199,7 +199,7 @@ get_property (MetaDisplay        *display,
                           False, req_type, &results->type, &results->format,
                           &results->n_items,
                           &results->bytes_after,
-                          (guchar **)&results->prop) != Success ||
+                          &results->prop) != Success ||
       results->type == None)
     {
       if (results->prop)
@@ -1051,7 +1051,7 @@ meta_prop_get_values (MetaDisplay   *display,
                                       &results.type, &results.format,
                                       &results.n_items,
                                       &results.bytes_after,
-                                      (char **)(&results.prop)) != Success ||
+                                      &results.prop) != Success ||
           results.type == None)
         {
           values[i].type = META_PROP_VALUE_INVALID;

tools/announce-wrangler.py

@@ -4,6 +4,7 @@ import glob
 import wordpresslib # http://www.blackbirdblog.it/programmazione/progetti/28
 import ConfigParser
 import os
+import re
 
 doaps = glob.glob("*.doap")
 
@@ -120,6 +121,10 @@ print "============ x8 x8 x8 ===== SEND THIS TO gnome-announce-list"
 print text_version
 print "============ x8 x8 x8 ===== ENDS"
 
+translations = re.sub('\((.*)\)',
+                      '(<a href="http://svn.gnome.org/viewvc/metacity/trunk/po/\\1.po">\\1</a>)',
+                      translations)
+
 html_version = """\
 <b>What is it ?</b><br />
 <ul>%s</ul>
@@ -137,7 +142,7 @@ html_version = """\
                 text_list(text_links, 'html'))
 
 cp = ConfigParser.ConfigParser()
-cp.read(os.environ['HOME']+'/.config/release-wrangler.ini')
+cp.read(os.environ['HOME']+'/.config/metacity/tools.ini')
 
 wp = wordpresslib.WordPressClient(
     cp.get('release-wrangler', 'blogurl'),

tools/commit-wrangler.py

@@ -26,6 +26,8 @@ import commands
 import sys
 import os
 import posixpath
+import ConfigParser
+import re
 
 # FIXME: Needs tidying into separate functions.
 
@@ -83,85 +85,29 @@ def wordwrap(str, prefix=''):
 
 #####################
 
+change_filename = 'ChangeLog'
+
 get_up_to_date()
 
-discoveries = {}
+cp = ConfigParser.ConfigParser()
+cp.read(os.environ['HOME']+'/.config/metacity/tools.ini')
 
-current_file = '?'
+os.environ['CHANGE_LOG_NAME'] = cp.get('commit-wrangler', 'name')
+os.environ['CHANGE_LOG_EMAIL_ADDRESS'] = cp.get('commit-wrangler', 'address')
 
-diff = commands.getstatusoutput('svn diff --diff-cmd $(which diff) -x -up')[1]
-
-for line in diff.split('\n'):
-    if line.startswith('---'):
-        current_file = line[4:line.find('\t')]
-    elif line.startswith('@@'):
-        atatpos = line.find('@@', 3)+3
-        discoveries.setdefault(current_file,{})[line[atatpos:line.find(' ',atatpos)]] = 1
-
-# yes, I know this is MY username. I will come back and fix it
-# later, but for now there is a lot else to do. FIXME
-your_username = 'Thomas Thurman  <tthurman@gnome.org>'
-
-change_filename = posixpath.expanduser("~/.commit-wrangler.txt")
-change = open(change_filename, 'w')
-change.write('# You are checking in a single changeset.\n')
-change.write('# The message below is the one which will be used\n')
-change.write('# both in the checkin and the changelog.\n')
-change.write('# Any lines starting with a "#" don\'t go in.\n')
-change.write('#\n')
-
-change.write('%s  %s\n\n' % (
-    time.strftime('%Y-%m-%d',time.gmtime()),
-    your_username))
-
-for filename in discoveries:
-    change.write(wordwrap('* %s (%s): something' % (
-                filename, ', '.join(discoveries[filename])),
-                '        ')+'\n')
-
-change.write('\n#\n#\n##############\n#\n#\n#\n')
-change.write('# And this is the original diff:\n#\n#')
-change.write(diff.replace('\n','\n#'))
-change.write('\n#\n#\n##############\n# EOF\n')
-change.close()
+print commands.getoutput('moap cl prep')
 
 time_before = os.stat(change_filename)[8]
 os.system(favourite_editor()+' +6 %s ' % (change_filename))
 
 if os.stat(change_filename)[8] == time_before:
-    print 'No change; aborting.'
+    print 'No change; aborting:'
+    print commands.getoutput('svn revert '+change_filename)
     sys.exit(0)
 
 # Update the changelog
 
-changelog_new = open('ChangeLog.tmp', 'w')
-changelog_justfunc = open(change_filename+'.justfunc', 'w')
-change = open(change_filename, 'r')
-for line in change.readlines():
-    if not line.startswith('#'):
-        changelog_new.write(line)
-        changelog_justfunc.write(line)
-change.close()
-changelog_justfunc.close()
+checkin = commands.getoutput("moap cl ci")
 
-changelog = open('ChangeLog', 'r')
-for line in changelog.readlines():
-    changelog_new.write(line)
-
-changelog.close()
-changelog_new.close()
-
-os.rename('ChangeLog.tmp', 'ChangeLog')
-
-committing = commands.getstatusoutput('svn commit --file %s.justfunc' % (change_filename))[1]
-
-print 'Committed: ', committing
-
-checkin = committing[committing.find('Committed revision')+19:]
-checkin = checkin[:checkin.find('.')]
-# this number will be useful in the future for updating
-# Bugzilla.
-
-print
-print 'http://svn.gnome.org/viewvc/metacity?rev=%s&view=rev' % (checkin)
+print re.sub(".*Committed revision (\\d+).*", 'http://svn.gnome.org/viewvc/metacity?rev=\\1&view=rev', checkin)