← Back to branch summary

~muktupavels/metacity/adwaita-icon-theme-lp-1414613

« back to all changes in this revision

Viewing changes to debian/patches/03_gtop_error.patch

  • Committer: Bazaar Package Importer
  • Author(s): Josselin Mouette
  • Date: 2010-06-16 23:32:32 UTC
  • mto: (2.3.2 sid)
  • mto: This revision was merged to the branch mainline in revision 96.
  • Revision ID: james.westby@ubuntu.com-20100616233232-elvo6ff6h0q2vjor
Tags: 1:2.30.1-2
http://bugs.debian.org/549290
http://bugs.debian.org/559576
* Refresh 02_restart_hint.patch.
* 03_gtop_error.patch: patch from Tomaž Šolc to handle libgtop errors.
  Closes: #549290.
* Switch to 3.0 source format.
* 04_gdk_grab_tracking.patch: patch from Owen Taylor to prevent events 
  from being transmitted to the wrong window. Closes: #559576.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/03_gtop_error.patch
 
1
--- metacity-2.28.0/src/core/window-props.c     2009-09-08 22:55:35.000000000 +0200
 
2
+++ metacity-2.28.0-tomaz/src/core/window-props.c       2010-02-16 11:38:50.000000000 +0100
 
3
@@ -337,8 +337,15 @@
 
4
       
 
5
   glibtop_get_proc_uid (&process_details, process);
 
6
 
 
7
-  *result = process_details.uid;
 
8
-  return TRUE;
 
9
+  if (process_details.flags & (1L << GLIBTOP_PROC_UID_UID) ) 
 
10
+    {
 
11
+      *result = process_details.uid;
 
12
+      return TRUE;
 
13
+    }
 
14
+  else
 
15
+    {
 
16
+      return FALSE;
 
17
+    }
 
18
 #else
 
19
   /* I don't know, maybe we could do something hairy like see whether
 
20
    * /proc/$PID exists and who owns it, in case they have procfs.