Mercurial Mercurial > upstream > oracle > spec-files / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patches/gtk3+-18-void-return.diff
author yippi
Mon, 27 Sep 2010 21:07:51 +0000
changeset 20108 51df67ca9307
parent 18292 9ff9c0fa64d9
permissions -rw-r--r--
I had these modules listed as being owned by me, but they are really owned by wangke, correcting.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
18292
9ff9c0fa64d9 2010-07-29 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
     1
 
Files gtk+-2.90.5.orig/gdk/.gdkinternals.h.swp and gtk+-2.90.5/gdk/.gdkinternals.h.swp differ
9ff9c0fa64d9 2010-07-29 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
     2
 
diff -ruN gtk+-2.90.5.orig/gdk/gdkdisplay.c gtk+-2.90.5/gdk/gdkdisplay.c
9ff9c0fa64d9 2010-07-29 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
     3
 
--- gtk+-2.90.5.orig/gdk/gdkdisplay.c	2010-07-19 11:48:51.685824460 +0100
9ff9c0fa64d9 2010-07-29 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
     4
 
+++ gtk+-2.90.5/gdk/gdkdisplay.c	2010-07-19 12:01:23.829346872 +0100
9ff9c0fa64d9 2010-07-29 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
     5
 
@@ -985,7 +985,8 @@
9ff9c0fa64d9 2010-07-29 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
     6
 
                                gint             *y,
9ff9c0fa64d9 2010-07-29 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
     7
 
                                GdkModifierType  *mask)
9ff9c0fa64d9 2010-07-29 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
     8
 
 {
9ff9c0fa64d9 2010-07-29 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
     9
 
-  return _gdk_windowing_get_device_state (display,
9ff9c0fa64d9 2010-07-29 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
    10
 
+  //return _gdk_windowing_get_device_state (display,
9ff9c0fa64d9 2010-07-29 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
    11
 
+  _gdk_windowing_get_device_state (display,
9ff9c0fa64d9 2010-07-29 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
    12
 
                                           display->core_pointer,
9ff9c0fa64d9 2010-07-29 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
    13
 
                                           screen, x, y, mask);
9ff9c0fa64d9 2010-07-29 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
    14
 
 }
upstream/oracle/spec-files