[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1222-gf6f7f6f

[Rob Savoye]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  f6f7f6f347d791b1edf462d022691f594f5da8c1 (commit)
       via  4a2996ff217aee1d45375b552475421420a2946e (commit)
      from  6c06e8ecd902a4cfe1185a8fa0c5fd55e50d26e0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=f6f7f6f347d791b1edf462d022691f594f5da8c1


commit f6f7f6f347d791b1edf462d022691f594f5da8c1
Merge: 4a2996f 6c06e8e
Author: Rob Savoye <address@hidden>
Date:   Sun Oct 30 12:09:46 2011 -0600

    Merge branch 'master' of git.sv.gnu.org:/srv/git/gnash


http://git.savannah.gnu.org/cgit//commit/?id=4a2996ff217aee1d45375b552475421420a2946e


commit 4a2996ff217aee1d45375b552475421420a2946e
Author: Rob Savoye <address@hidden>
Date:   Sun Oct 30 12:09:27 2011 -0600

    Use __null instead of NULL for pointers

diff --git a/gui/gtk/gtk.cpp b/gui/gtk/gtk.cpp
index 73c95f2..3bd3652 100644
--- a/gui/gtk/gtk.cpp
+++ b/gui/gtk/gtk.cpp
@@ -410,7 +410,7 @@ GtkGui::setCursor(gnash_cursor_type newcursor)
             cursortype = GDK_LAST_CURSOR;
     }
   
-    GdkCursor* gdkcursor = NULL;
+    GdkCursor* gdkcursor = __null;
   
     if (cursortype != GDK_LAST_CURSOR) {
          gdkcursor = gdk_cursor_new(cursortype);
@@ -1225,7 +1225,7 @@ PreferencesDialog::PreferencesDialog(GtkWidget* window)
                     // The buttons and their response codes:
                     GTK_STOCK_OK, GTK_RESPONSE_OK,
                     GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                    NULL);
+                    __null);
     // Add Gnash icon
     addGnashIcon(GTK_WINDOW(_prefsDialog));
 

-----------------------------------------------------------------------

Summary of changes:
 gui/gtk/gtk.cpp |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Gnash