Ticket #75: dbus-0.61-glib.patch

Line 
1 Reported to upstream: http://trac.galago-project.org/ticket/75#preview
2
3 <!-- MHonArc v2.6.12 -->
4 <!--X-Subject: rpms/notify&#45;daemon/devel notify&#45;daemon&#45;0.3.1&#45;dbus&#45;0.61.patch, NONE,  1.1 notify&#45;daemon.spec, 1.11, 1.12 -->
5 <!--X-From-R13: srqben&#45;pif&#45;pbzzvgfNerqung.pbz -->
6 <!--X-Date: Wed, 8 Mar 2006 13:24:39 &#45;0500 -->
7 <!--X-Message-Id: 200603081824.k28IObR1025226@cvs.devel.redhat.com -->
8 <!--X-Content-Type: text/plain -->
9 <!--X-Head-End-->
10 <!--#include virtual="/header.html"-->
11 <!--#include virtual="/search.html"-->
12 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML//EN">
13 <HTML>
14 <HEAD>
15 <TITLE>rpms/notify-daemon/devel notify-daemon-0.3.1-dbus-0.61.patch, NONE,  1.1 </TITLE>
16 <LINK REV="made" HREF="mailto:fedora-cvs-commits@redhat.com">
17 </HEAD>
18 <BODY BGCOLOR="#FFFFFF">
19 <!--X-Body-Begin-->
20 <!--X-User-Header-->
21 <!--X-User-Header-End-->
22 <!--X-TopPNI-->
23 <HR>
24 [<a href="msg00490.html">Date Prev</a>][<a href="msg00492.html">Date Next</a>] &nbsp; [<a href="msg00490.html">Thread Prev</a>][<a href="msg00492.html">Thread Next</a>] &nbsp;
25 [<A HREF="thread.html#00491">Thread Index</A>]
26 [<A HREF="date.html#00491">Date Index</A>]
27 [<A HREF="author.html#00491">Author Index</A>]
28
29 <!--X-TopPNI-End-->
30 <!--X-MsgBody-->
31 <!--X-Subject-Header-Begin-->
32 <h1>rpms/notify-daemon/devel notify-daemon-0.3.1-dbus-0.61.patch, NONE, 1.1 notify-daemon.spec, 1.11, 1.12</h1>
33 <hr>
34 <!--X-Subject-Header-End-->
35 <!--X-Head-of-Message-->
36 <ul>
37 <li><em>From</em>: fedora-cvs-commits redhat com</li>
38 <li><em>To</em>: fedora-cvs-commits redhat com</li>
39 <li><em>Subject</em>: rpms/notify-daemon/devel notify-daemon-0.3.1-dbus-0.61.patch, NONE,   1.1 notify-daemon.spec, 1.11, 1.12</li>
40 <li><em>Date</em>: Wed, 8 Mar 2006 13:24:37 -0500</li>
41 </ul>
42 <!--X-Head-of-Message-End-->
43 <!--X-Head-Body-Sep-Begin-->
44 <hr>
45 <!--X-Head-Body-Sep-End-->
46 <!--X-Body-of-Message-->
47 <pre>Author: johnp
48
49 Update of /cvs/dist/rpms/notify-daemon/devel
50 In directory cvs.devel.redhat.com:/tmp/cvs-serv25136
51
52 Modified Files:
53     notify-daemon.spec
54 Added Files:
55     notify-daemon-0.3.1-dbus-0.61.patch
56 Log Message:
57 - Add patch to fix struct handling in the dbus glib binding for dbus 0.61
58   so image data works again
59
60
61
62 notify-daemon-0.3.1-dbus-0.61.patch:
63  notifydaemon.c |   18 +++++++++++++++---
64  1 files changed, 15 insertions(+), 3 deletions(-)
65
66 --- NEW FILE notify-daemon-0.3.1-dbus-0.61.patch ---
67 --- notify-daemon-0.3.1/src/notifydaemon.c.dbus-0.61    2006-03-08 12:39:54.000000000 -0500
68 +++ notify-daemon-0.3.1/src/daemon.c    2006-03-08 13:13:11.000000000 -0500
69 @@ -400,7 +374,20 @@
70     GValue *value;
71     GArray *tmp_array;
72  
73 +  GType struct_type;
74 +
75 +
76 +  struct_type = dbus_g_type_get_struct ("GValueArray",
77 +                                        G_TYPE_INT,
78 +                   G_TYPE_INT,
79 +                   G_TYPE_INT,
80 +                   G_TYPE_BOOLEAN,
81 +                   G_TYPE_INT,
82 +                   G_TYPE_INT,
83 +                   dbus_g_type_get_collection ("GArray", G_TYPE_UCHAR),
84 +                                        G_TYPE_INVALID);
85 +
86 +  if (!G_VALUE_HOLDS (icon_data, struct_type))
87 -   if (!G_VALUE_HOLDS(icon_data, G_TYPE_VALUE_ARRAY))
88     {
89         g_warning("_notify_daemon_process_icon_data expected a "
90                   "GValue of type GValueArray");
91
92
93 </pre>
94 <!--X-Body-of-Message-End-->
95 <!--X-MsgBody-End-->
96 <!--X-Follow-Ups-->
97 <hr>
98 <!--X-Follow-Ups-End-->
99 <!--X-References-->
100 <!--X-References-End-->
101 <!--X-BotPNI-->
102 [<a href="msg00490.html">Date Prev</a>][<a href="msg00492.html">Date Next</a>] &nbsp; [<a href="msg00490.html">Thread Prev</a>][<a href="msg00492.html">Thread Next</a>] &nbsp;
103 [<A HREF="thread.html#00491">Thread Index</A>]
104 [<A HREF="date.html#00491">Date Index</A>]
105 [<A HREF="author.html#00491">Author Index</A>]
106
107 <!--X-BotPNI-End-->
108 <!--X-User-Footer-->
109 <!--X-User-Footer-End-->
110 <!--#include virtual="/footer.html"-->
111 </body>
112 </html>