Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/xorg-server/patches/xorg-server-1.17.1-systemd-logind-dont-second-guess-dbus-default-tim.patch

    Diff of /trunk/xorg-server/patches/xorg-server-1.17.1-systemd-logind-dont-second-guess-dbus-default-tim.patch

    Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

    revision 2575 by niro, Mon Jun 15 12:22:48 2015 UTC revision 2576 by niro, Mon Jun 15 13:02:17 2015 UTC
    # Line 1  Line 1 
    1  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"  From 89250c82a01062775f8f840737a757125138fbce Mon Sep 17 00:00:00 2001
    2    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">  From: Ray Strode <rstrode@redhat.com>
     <html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>  
     <head>  
     <title>svntogit/packages.git - Git clone of the 'packages' repository  
     </title>  
     <meta name='generator' content='cgit v0.10.2'/>  
     <meta name='robots' content='index, nofollow'/>  
     <link rel='stylesheet' type='text/css' href='/cgit.css'/>  
     <link rel='shortcut icon' href='/favicon.ico'/>  
     <link rel='alternate' title='Atom feed' href='https://projects.archlinux.org/svntogit/packages.git/atom/trunk/systemd-logind-dont-second-guess-D-Bus-default-tim.patch?h=packages/xorg-server' type='application/atom+xml'/>  
     <link rel='vcs-git' href='git://projects.archlinux.org/svntogit/packages.git' title='svntogit/packages.git Git repository'/>  
     <link rel='vcs-git' href='http://projects.archlinux.org/git/svntogit/packages.git' title='svntogit/packages.git Git repository'/>  
     <link rel='vcs-git' href='https://projects.archlinux.org/git/svntogit/packages.git' title='svntogit/packages.git Git repository'/>  
     <link rel='vcs-git' href='ssh://gerolde.archlinux.org/srv/projects/git/svntogit/packages.git' title='svntogit/packages.git Git repository'/>  
     </head>  
     <body>  
      <div id="archnavbar"><!-- Arch Linux global navigation bar -->  
      <div id="archnavbarlogo">  
      <p><a href="http://www.archlinux.org/" title="Arch news, packages, projects and more"></a></p>  
      </div>  
      <div id="archnavbarmenu">  
      <ul id="archnavbarlist">  
      <li id="anb-home"><a href="http://www.archlinux.org/" title="Arch news, packages, projects and more">Home</a></li>  
      <li id="anb-packages"><a href="http://www.archlinux.org/packages/" title="Arch Package Database">Packages</a></li>  
      <li id="anb-forums"><a href="https://bbs.archlinux.org/" title="Community forums">Forums</a></li>  
      <li id="anb-wiki"><a href="https://wiki.archlinux.org/" title="Community documentation">Wiki</a></li>  
      <li id="anb-bugs"><a href="https://bugs.archlinux.org/" title="Report and follow bugs">Bugs</a></li>  
      <li id="anb-aur"><a href="https://aur.archlinux.org/" title="Arch Linux User Repository">AUR</a></li>  
      <li id="anb-download"><a href="http://www.archlinux.org/download/" title="Get Arch Linux">Download</a></li>  
      </ul>  
      </div>  
      </div><!-- #archnavbar -->  
     <div id='cgit'><table id='header'>  
     <tr>  
     <td class='main'><a href='/'>index</a> : <a title='svntogit/packages.git' href='/svntogit/packages.git/'>svntogit/packages.git</a></td></tr>  
     <tr><td class='sub'>Git clone of the 'packages' repository  
     </td><td class='sub right'></td></tr></table>  
     <table class='tabs'><tr><td>  
     <a href='/svntogit/packages.git/?h=packages/xorg-server'>summary</a><a href='/svntogit/packages.git/refs/?h=packages/xorg-server'>refs</a><a href='/svntogit/packages.git/log/trunk/systemd-logind-dont-second-guess-D-Bus-default-tim.patch?h=packages/xorg-server'>log</a><a class='active' href='/svntogit/packages.git/tree/trunk/systemd-logind-dont-second-guess-D-Bus-default-tim.patch?h=packages/xorg-server'>tree</a><a href='/svntogit/packages.git/commit/trunk/systemd-logind-dont-second-guess-D-Bus-default-tim.patch?h=packages/xorg-server'>commit</a><a href='/svntogit/packages.git/diff/trunk/systemd-logind-dont-second-guess-D-Bus-default-tim.patch?h=packages/xorg-server'>diff</a><a href='/svntogit/packages.git/stats/trunk/systemd-logind-dont-second-guess-D-Bus-default-tim.patch?h=packages/xorg-server'>stats</a></td><td class='form'><form class='right' method='get' action='/svntogit/packages.git/log/trunk/systemd-logind-dont-second-guess-D-Bus-default-tim.patch'>  
     <input type='hidden' name='h' value='packages/xorg-server'/><select name='qt'>  
     <option value='grep'>log msg</option>  
     <option value='author'>author</option>  
     <option value='committer'>committer</option>  
     <option value='range'>range</option>  
     </select>  
     <input class='txt' type='text' size='10' name='q' value=''/>  
     <input type='submit' value='search'/>  
     </form>  
     </td></tr></table>  
     <div class='path'>path: <a href='/svntogit/packages.git/tree/?h=packages/xorg-server'>root</a>/<a href='/svntogit/packages.git/tree/trunk?h=packages/xorg-server'>trunk</a>/<a href='/svntogit/packages.git/tree/trunk/systemd-logind-dont-second-guess-D-Bus-default-tim.patch?h=packages/xorg-server'>systemd-logind-dont-second-guess-D-Bus-default-tim.patch</a></div><div class='content'>blob: 0245211ad198ecffed3b6fc6b7391ce8007e74e9 (<a href='/svntogit/packages.git/plain/trunk/systemd-logind-dont-second-guess-D-Bus-default-tim.patch?h=packages/xorg-server'>plain</a>)  
     <table summary='blob content' class='blob'>  
     <tr><td class='linenumbers'><pre><a id='n1' href='#n1'>1</a>  
     <a id='n2' href='#n2'>2</a>  
     <a id='n3' href='#n3'>3</a>  
     <a id='n4' href='#n4'>4</a>  
     <a id='n5' href='#n5'>5</a>  
     <a id='n6' href='#n6'>6</a>  
     <a id='n7' href='#n7'>7</a>  
     <a id='n8' href='#n8'>8</a>  
     <a id='n9' href='#n9'>9</a>  
     <a id='n10' href='#n10'>10</a>  
     <a id='n11' href='#n11'>11</a>  
     <a id='n12' href='#n12'>12</a>  
     <a id='n13' href='#n13'>13</a>  
     <a id='n14' href='#n14'>14</a>  
     <a id='n15' href='#n15'>15</a>  
     <a id='n16' href='#n16'>16</a>  
     <a id='n17' href='#n17'>17</a>  
     <a id='n18' href='#n18'>18</a>  
     <a id='n19' href='#n19'>19</a>  
     <a id='n20' href='#n20'>20</a>  
     <a id='n21' href='#n21'>21</a>  
     <a id='n22' href='#n22'>22</a>  
     <a id='n23' href='#n23'>23</a>  
     <a id='n24' href='#n24'>24</a>  
     <a id='n25' href='#n25'>25</a>  
     <a id='n26' href='#n26'>26</a>  
     <a id='n27' href='#n27'>27</a>  
     <a id='n28' href='#n28'>28</a>  
     <a id='n29' href='#n29'>29</a>  
     <a id='n30' href='#n30'>30</a>  
     <a id='n31' href='#n31'>31</a>  
     <a id='n32' href='#n32'>32</a>  
     <a id='n33' href='#n33'>33</a>  
     <a id='n34' href='#n34'>34</a>  
     <a id='n35' href='#n35'>35</a>  
     <a id='n36' href='#n36'>36</a>  
     <a id='n37' href='#n37'>37</a>  
     <a id='n38' href='#n38'>38</a>  
     <a id='n39' href='#n39'>39</a>  
     <a id='n40' href='#n40'>40</a>  
     <a id='n41' href='#n41'>41</a>  
     <a id='n42' href='#n42'>42</a>  
     <a id='n43' href='#n43'>43</a>  
     <a id='n44' href='#n44'>44</a>  
     <a id='n45' href='#n45'>45</a>  
     <a id='n46' href='#n46'>46</a>  
     <a id='n47' href='#n47'>47</a>  
     <a id='n48' href='#n48'>48</a>  
     <a id='n49' href='#n49'>49</a>  
     <a id='n50' href='#n50'>50</a>  
     <a id='n51' href='#n51'>51</a>  
     <a id='n52' href='#n52'>52</a>  
     <a id='n53' href='#n53'>53</a>  
     <a id='n54' href='#n54'>54</a>  
     <a id='n55' href='#n55'>55</a>  
     <a id='n56' href='#n56'>56</a>  
     <a id='n57' href='#n57'>57</a>  
     <a id='n58' href='#n58'>58</a>  
     <a id='n59' href='#n59'>59</a>  
     <a id='n60' href='#n60'>60</a>  
     <a id='n61' href='#n61'>61</a>  
     <a id='n62' href='#n62'>62</a>  
     <a id='n63' href='#n63'>63</a>  
     <a id='n64' href='#n64'>64</a>  
     <a id='n65' href='#n65'>65</a>  
     <a id='n66' href='#n66'>66</a>  
     <a id='n67' href='#n67'>67</a>  
     <a id='n68' href='#n68'>68</a>  
     <a id='n69' href='#n69'>69</a>  
     <a id='n70' href='#n70'>70</a>  
     <a id='n71' href='#n71'>71</a>  
     <a id='n72' href='#n72'>72</a>  
     <a id='n73' href='#n73'>73</a>  
     <a id='n74' href='#n74'>74</a>  
     <a id='n75' href='#n75'>75</a>  
     <a id='n76' href='#n76'>76</a>  
     <a id='n77' href='#n77'>77</a>  
     <a id='n78' href='#n78'>78</a>  
     <a id='n79' href='#n79'>79</a>  
     <a id='n80' href='#n80'>80</a>  
     <a id='n81' href='#n81'>81</a>  
     <a id='n82' href='#n82'>82</a>  
     <a id='n83' href='#n83'>83</a>  
     <a id='n84' href='#n84'>84</a>  
     <a id='n85' href='#n85'>85</a>  
     <a id='n86' href='#n86'>86</a>  
     <a id='n87' href='#n87'>87</a>  
     <a id='n88' href='#n88'>88</a>  
     <a id='n89' href='#n89'>89</a>  
     <a id='n90' href='#n90'>90</a>  
     <a id='n91' href='#n91'>91</a>  
     <a id='n92' href='#n92'>92</a>  
     <a id='n93' href='#n93'>93</a>  
     <a id='n94' href='#n94'>94</a>  
     <a id='n95' href='#n95'>95</a>  
     <a id='n96' href='#n96'>96</a>  
     <a id='n97' href='#n97'>97</a>  
     <a id='n98' href='#n98'>98</a>  
     <a id='n99' href='#n99'>99</a>  
     <a id='n100' href='#n100'>100</a>  
     <a id='n101' href='#n101'>101</a>  
     <a id='n102' href='#n102'>102</a>  
     <a id='n103' href='#n103'>103</a>  
     <a id='n104' href='#n104'>104</a>  
     <a id='n105' href='#n105'>105</a>  
     <a id='n106' href='#n106'>106</a>  
     <a id='n107' href='#n107'>107</a>  
     <a id='n108' href='#n108'>108</a>  
     <a id='n109' href='#n109'>109</a>  
     <a id='n110' href='#n110'>110</a>  
     <a id='n111' href='#n111'>111</a>  
     <a id='n112' href='#n112'>112</a>  
     <a id='n113' href='#n113'>113</a>  
     <a id='n114' href='#n114'>114</a>  
     <a id='n115' href='#n115'>115</a>  
     <a id='n116' href='#n116'>116</a>  
     <a id='n117' href='#n117'>117</a>  
     <a id='n118' href='#n118'>118</a>  
     <a id='n119' href='#n119'>119</a>  
     <a id='n120' href='#n120'>120</a>  
     <a id='n121' href='#n121'>121</a>  
     <a id='n122' href='#n122'>122</a>  
     <a id='n123' href='#n123'>123</a>  
     <a id='n124' href='#n124'>124</a>  
     <a id='n125' href='#n125'>125</a>  
     <a id='n126' href='#n126'>126</a>  
     <a id='n127' href='#n127'>127</a>  
     <a id='n128' href='#n128'>128</a>  
     <a id='n129' href='#n129'>129</a>  
     <a id='n130' href='#n130'>130</a>  
     <a id='n131' href='#n131'>131</a>  
     <a id='n132' href='#n132'>132</a>  
     <a id='n133' href='#n133'>133</a>  
     <a id='n134' href='#n134'>134</a>  
     <a id='n135' href='#n135'>135</a>  
     <a id='n136' href='#n136'>136</a>  
     <a id='n137' href='#n137'>137</a>  
     <a id='n138' href='#n138'>138</a>  
     <a id='n139' href='#n139'>139</a>  
     <a id='n140' href='#n140'>140</a>  
     <a id='n141' href='#n141'>141</a>  
     <a id='n142' href='#n142'>142</a>  
     <a id='n143' href='#n143'>143</a>  
     <a id='n144' href='#n144'>144</a>  
     <a id='n145' href='#n145'>145</a>  
     <a id='n146' href='#n146'>146</a>  
     <a id='n147' href='#n147'>147</a>  
     <a id='n148' href='#n148'>148</a>  
     <a id='n149' href='#n149'>149</a>  
     <a id='n150' href='#n150'>150</a>  
     <a id='n151' href='#n151'>151</a>  
     <a id='n152' href='#n152'>152</a>  
     <a id='n153' href='#n153'>153</a>  
     <a id='n154' href='#n154'>154</a>  
     <a id='n155' href='#n155'>155</a>  
     <a id='n156' href='#n156'>156</a>  
     <a id='n157' href='#n157'>157</a>  
     <a id='n158' href='#n158'>158</a>  
     <a id='n159' href='#n159'>159</a>  
     <a id='n160' href='#n160'>160</a>  
     <a id='n161' href='#n161'>161</a>  
     <a id='n162' href='#n162'>162</a>  
     <a id='n163' href='#n163'>163</a>  
     <a id='n164' href='#n164'>164</a>  
     <a id='n165' href='#n165'>165</a>  
     <a id='n166' href='#n166'>166</a>  
     <a id='n167' href='#n167'>167</a>  
     <a id='n168' href='#n168'>168</a>  
     <a id='n169' href='#n169'>169</a>  
     <a id='n170' href='#n170'>170</a>  
     <a id='n171' href='#n171'>171</a>  
     <a id='n172' href='#n172'>172</a>  
     <a id='n173' href='#n173'>173</a>  
     <a id='n174' href='#n174'>174</a>  
     <a id='n175' href='#n175'>175</a>  
     <a id='n176' href='#n176'>176</a>  
     <a id='n177' href='#n177'>177</a>  
     <a id='n178' href='#n178'>178</a>  
     <a id='n179' href='#n179'>179</a>  
     <a id='n180' href='#n180'>180</a>  
     <a id='n181' href='#n181'>181</a>  
     <a id='n182' href='#n182'>182</a>  
     <a id='n183' href='#n183'>183</a>  
     <a id='n184' href='#n184'>184</a>  
     <a id='n185' href='#n185'>185</a>  
     <a id='n186' href='#n186'>186</a>  
     <a id='n187' href='#n187'>187</a>  
     <a id='n188' href='#n188'>188</a>  
     <a id='n189' href='#n189'>189</a>  
     <a id='n190' href='#n190'>190</a>  
     <a id='n191' href='#n191'>191</a>  
     <a id='n192' href='#n192'>192</a>  
     <a id='n193' href='#n193'>193</a>  
     <a id='n194' href='#n194'>194</a>  
     <a id='n195' href='#n195'>195</a>  
     <a id='n196' href='#n196'>196</a>  
     <a id='n197' href='#n197'>197</a>  
     <a id='n198' href='#n198'>198</a>  
     <a id='n199' href='#n199'>199</a>  
     <a id='n200' href='#n200'>200</a>  
     <a id='n201' href='#n201'>201</a>  
     <a id='n202' href='#n202'>202</a>  
     <a id='n203' href='#n203'>203</a>  
     <a id='n204' href='#n204'>204</a>  
     <a id='n205' href='#n205'>205</a>  
     <a id='n206' href='#n206'>206</a>  
     <a id='n207' href='#n207'>207</a>  
     <a id='n208' href='#n208'>208</a>  
     <a id='n209' href='#n209'>209</a>  
     <a id='n210' href='#n210'>210</a>  
     <a id='n211' href='#n211'>211</a>  
     <a id='n212' href='#n212'>212</a>  
     <a id='n213' href='#n213'>213</a>  
     <a id='n214' href='#n214'>214</a>  
     <a id='n215' href='#n215'>215</a>  
     <a id='n216' href='#n216'>216</a>  
     <a id='n217' href='#n217'>217</a>  
     <a id='n218' href='#n218'>218</a>  
     <a id='n219' href='#n219'>219</a>  
     <a id='n220' href='#n220'>220</a>  
     <a id='n221' href='#n221'>221</a>  
     <a id='n222' href='#n222'>222</a>  
     <a id='n223' href='#n223'>223</a>  
     <a id='n224' href='#n224'>224</a>  
     <a id='n225' href='#n225'>225</a>  
     <a id='n226' href='#n226'>226</a>  
     <a id='n227' href='#n227'>227</a>  
     <a id='n228' href='#n228'>228</a>  
     <a id='n229' href='#n229'>229</a>  
     <a id='n230' href='#n230'>230</a>  
     <a id='n231' href='#n231'>231</a>  
     <a id='n232' href='#n232'>232</a>  
     <a id='n233' href='#n233'>233</a>  
     <a id='n234' href='#n234'>234</a>  
     <a id='n235' href='#n235'>235</a>  
     <a id='n236' href='#n236'>236</a>  
     <a id='n237' href='#n237'>237</a>  
     <a id='n238' href='#n238'>238</a>  
     <a id='n239' href='#n239'>239</a>  
     <a id='n240' href='#n240'>240</a>  
     <a id='n241' href='#n241'>241</a>  
     <a id='n242' href='#n242'>242</a>  
     <a id='n243' href='#n243'>243</a>  
     <a id='n244' href='#n244'>244</a>  
     <a id='n245' href='#n245'>245</a>  
     <a id='n246' href='#n246'>246</a>  
     <a id='n247' href='#n247'>247</a>  
     <a id='n248' href='#n248'>248</a>  
     <a id='n249' href='#n249'>249</a>  
     <a id='n250' href='#n250'>250</a>  
     <a id='n251' href='#n251'>251</a>  
     <a id='n252' href='#n252'>252</a>  
     <a id='n253' href='#n253'>253</a>  
     <a id='n254' href='#n254'>254</a>  
     <a id='n255' href='#n255'>255</a>  
     <a id='n256' href='#n256'>256</a>  
     <a id='n257' href='#n257'>257</a>  
     <a id='n258' href='#n258'>258</a>  
     <a id='n259' href='#n259'>259</a>  
     <a id='n260' href='#n260'>260</a>  
     <a id='n261' href='#n261'>261</a>  
     <a id='n262' href='#n262'>262</a>  
     <a id='n263' href='#n263'>263</a>  
     <a id='n264' href='#n264'>264</a>  
     <a id='n265' href='#n265'>265</a>  
     <a id='n266' href='#n266'>266</a>  
     <a id='n267' href='#n267'>267</a>  
     <a id='n268' href='#n268'>268</a>  
     <a id='n269' href='#n269'>269</a>  
     <a id='n270' href='#n270'>270</a>  
     <a id='n271' href='#n271'>271</a>  
     <a id='n272' href='#n272'>272</a>  
     <a id='n273' href='#n273'>273</a>  
     <a id='n274' href='#n274'>274</a>  
     <a id='n275' href='#n275'>275</a>  
     <a id='n276' href='#n276'>276</a>  
     <a id='n277' href='#n277'>277</a>  
     <a id='n278' href='#n278'>278</a>  
     <a id='n279' href='#n279'>279</a>  
     <a id='n280' href='#n280'>280</a>  
     <a id='n281' href='#n281'>281</a>  
     <a id='n282' href='#n282'>282</a>  
     <a id='n283' href='#n283'>283</a>  
     <a id='n284' href='#n284'>284</a>  
     <a id='n285' href='#n285'>285</a>  
     <a id='n286' href='#n286'>286</a>  
     <a id='n287' href='#n287'>287</a>  
     <a id='n288' href='#n288'>288</a>  
     <a id='n289' href='#n289'>289</a>  
     <a id='n290' href='#n290'>290</a>  
     <a id='n291' href='#n291'>291</a>  
     <a id='n292' href='#n292'>292</a>  
     <a id='n293' href='#n293'>293</a>  
     <a id='n294' href='#n294'>294</a>  
     <a id='n295' href='#n295'>295</a>  
     <a id='n296' href='#n296'>296</a>  
     <a id='n297' href='#n297'>297</a>  
     <a id='n298' href='#n298'>298</a>  
     <a id='n299' href='#n299'>299</a>  
     <a id='n300' href='#n300'>300</a>  
     <a id='n301' href='#n301'>301</a>  
     <a id='n302' href='#n302'>302</a>  
     <a id='n303' href='#n303'>303</a>  
     <a id='n304' href='#n304'>304</a>  
     <a id='n305' href='#n305'>305</a>  
     <a id='n306' href='#n306'>306</a>  
     <a id='n307' href='#n307'>307</a>  
     <a id='n308' href='#n308'>308</a>  
     <a id='n309' href='#n309'>309</a>  
     <a id='n310' href='#n310'>310</a>  
     <a id='n311' href='#n311'>311</a>  
     <a id='n312' href='#n312'>312</a>  
     <a id='n313' href='#n313'>313</a>  
     <a id='n314' href='#n314'>314</a>  
     <a id='n315' href='#n315'>315</a>  
     <a id='n316' href='#n316'>316</a>  
     <a id='n317' href='#n317'>317</a>  
     <a id='n318' href='#n318'>318</a>  
     <a id='n319' href='#n319'>319</a>  
     <a id='n320' href='#n320'>320</a>  
     <a id='n321' href='#n321'>321</a>  
     <a id='n322' href='#n322'>322</a>  
     <a id='n323' href='#n323'>323</a>  
     <a id='n324' href='#n324'>324</a>  
     <a id='n325' href='#n325'>325</a>  
     <a id='n326' href='#n326'>326</a>  
     <a id='n327' href='#n327'>327</a>  
     <a id='n328' href='#n328'>328</a>  
     <a id='n329' href='#n329'>329</a>  
     <a id='n330' href='#n330'>330</a>  
     <a id='n331' href='#n331'>331</a>  
     <a id='n332' href='#n332'>332</a>  
     <a id='n333' href='#n333'>333</a>  
     <a id='n334' href='#n334'>334</a>  
     <a id='n335' href='#n335'>335</a>  
     <a id='n336' href='#n336'>336</a>  
     <a id='n337' href='#n337'>337</a>  
     <a id='n338' href='#n338'>338</a>  
     <a id='n339' href='#n339'>339</a>  
     <a id='n340' href='#n340'>340</a>  
     <a id='n341' href='#n341'>341</a>  
     <a id='n342' href='#n342'>342</a>  
     <a id='n343' href='#n343'>343</a>  
     <a id='n344' href='#n344'>344</a>  
     <a id='n345' href='#n345'>345</a>  
     <a id='n346' href='#n346'>346</a>  
     <a id='n347' href='#n347'>347</a>  
     <a id='n348' href='#n348'>348</a>  
     <a id='n349' href='#n349'>349</a>  
     <a id='n350' href='#n350'>350</a>  
     <a id='n351' href='#n351'>351</a>  
     <a id='n352' href='#n352'>352</a>  
     <a id='n353' href='#n353'>353</a>  
     <a id='n354' href='#n354'>354</a>  
     <a id='n355' href='#n355'>355</a>  
     <a id='n356' href='#n356'>356</a>  
     <a id='n357' href='#n357'>357</a>  
     <a id='n358' href='#n358'>358</a>  
     <a id='n359' href='#n359'>359</a>  
     <a id='n360' href='#n360'>360</a>  
     <a id='n361' href='#n361'>361</a>  
     <a id='n362' href='#n362'>362</a>  
     <a id='n363' href='#n363'>363</a>  
     <a id='n364' href='#n364'>364</a>  
     <a id='n365' href='#n365'>365</a>  
     <a id='n366' href='#n366'>366</a>  
     <a id='n367' href='#n367'>367</a>  
     <a id='n368' href='#n368'>368</a>  
     <a id='n369' href='#n369'>369</a>  
     <a id='n370' href='#n370'>370</a>  
     <a id='n371' href='#n371'>371</a>  
     <a id='n372' href='#n372'>372</a>  
     <a id='n373' href='#n373'>373</a>  
     <a id='n374' href='#n374'>374</a>  
     <a id='n375' href='#n375'>375</a>  
     <a id='n376' href='#n376'>376</a>  
     <a id='n377' href='#n377'>377</a>  
     <a id='n378' href='#n378'>378</a>  
     <a id='n379' href='#n379'>379</a>  
     <a id='n380' href='#n380'>380</a>  
     <a id='n381' href='#n381'>381</a>  
     <a id='n382' href='#n382'>382</a>  
     <a id='n383' href='#n383'>383</a>  
     <a id='n384' href='#n384'>384</a>  
     <a id='n385' href='#n385'>385</a>  
     <a id='n386' href='#n386'>386</a>  
     <a id='n387' href='#n387'>387</a>  
     <a id='n388' href='#n388'>388</a>  
     <a id='n389' href='#n389'>389</a>  
     <a id='n390' href='#n390'>390</a>  
     <a id='n391' href='#n391'>391</a>  
     <a id='n392' href='#n392'>392</a>  
     <a id='n393' href='#n393'>393</a>  
     <a id='n394' href='#n394'>394</a>  
     <a id='n395' href='#n395'>395</a>  
     <a id='n396' href='#n396'>396</a>  
     <a id='n397' href='#n397'>397</a>  
     <a id='n398' href='#n398'>398</a>  
     <a id='n399' href='#n399'>399</a>  
     <a id='n400' href='#n400'>400</a>  
     <a id='n401' href='#n401'>401</a>  
     <a id='n402' href='#n402'>402</a>  
     <a id='n403' href='#n403'>403</a>  
     <a id='n404' href='#n404'>404</a>  
     <a id='n405' href='#n405'>405</a>  
     <a id='n406' href='#n406'>406</a>  
     <a id='n407' href='#n407'>407</a>  
     <a id='n408' href='#n408'>408</a>  
     <a id='n409' href='#n409'>409</a>  
     <a id='n410' href='#n410'>410</a>  
     <a id='n411' href='#n411'>411</a>  
     <a id='n412' href='#n412'>412</a>  
     <a id='n413' href='#n413'>413</a>  
     <a id='n414' href='#n414'>414</a>  
     <a id='n415' href='#n415'>415</a>  
     <a id='n416' href='#n416'>416</a>  
     <a id='n417' href='#n417'>417</a>  
     <a id='n418' href='#n418'>418</a>  
     <a id='n419' href='#n419'>419</a>  
     <a id='n420' href='#n420'>420</a>  
     <a id='n421' href='#n421'>421</a>  
     <a id='n422' href='#n422'>422</a>  
     <a id='n423' href='#n423'>423</a>  
     <a id='n424' href='#n424'>424</a>  
     <a id='n425' href='#n425'>425</a>  
     <a id='n426' href='#n426'>426</a>  
     <a id='n427' href='#n427'>427</a>  
     <a id='n428' href='#n428'>428</a>  
     <a id='n429' href='#n429'>429</a>  
     <a id='n430' href='#n430'>430</a>  
     <a id='n431' href='#n431'>431</a>  
     <a id='n432' href='#n432'>432</a>  
     <a id='n433' href='#n433'>433</a>  
     <a id='n434' href='#n434'>434</a>  
     <a id='n435' href='#n435'>435</a>  
     <a id='n436' href='#n436'>436</a>  
     <a id='n437' href='#n437'>437</a>  
     <a id='n438' href='#n438'>438</a>  
     <a id='n439' href='#n439'>439</a>  
     <a id='n440' href='#n440'>440</a>  
     <a id='n441' href='#n441'>441</a>  
     <a id='n442' href='#n442'>442</a>  
     <a id='n443' href='#n443'>443</a>  
     <a id='n444' href='#n444'>444</a>  
     <a id='n445' href='#n445'>445</a>  
     <a id='n446' href='#n446'>446</a>  
     </pre></td>  
     <td class='lines'><pre><code>From 89250c82a01062775f8f840737a757125138fbce Mon Sep 17 00:00:00 2001  
     From: Ray Strode &lt;rstrode&#64;redhat.com&gt;  
    3  Date: Fri, 10 Apr 2015 14:19:50 -0400  Date: Fri, 10 Apr 2015 14:19:50 -0400
    4  Subject: [PATCH] systemd-logind: don't second guess D-Bus default timeout  Subject: [PATCH] systemd-logind: don't second guess D-Bus default timeout
    5    
    # Line 519  X server already depends on for proper f Line 20  X server already depends on for proper f
    20  This commit changes systemd-logind to just use the default timeouts.  This commit changes systemd-logind to just use the default timeouts.
    21    
    22  https://bugzilla.redhat.com/show_bug.cgi?id=1209347  https://bugzilla.redhat.com/show_bug.cgi?id=1209347
    23  <span class="hl kwb">---</span>  ---
    24   hw/xfree86/os-support/linux/systemd-logind.c | 14 ++++++--------   hw/xfree86/os-support/linux/systemd-logind.c | 14 ++++++--------
    25   1 file changed, 6 insertions(+), 8 deletions(-)   1 file changed, 6 insertions(+), 8 deletions(-)
    26    
    27  diff --git a/hw/xfree86/os-support/linux/systemd-logind.c b/hw/xfree86/os-support/linux/systemd-logind.c  diff --git a/hw/xfree86/os-support/linux/systemd-logind.c b/hw/xfree86/os-support/linux/systemd-logind.c
    28  index 57c87c0..4ad41a3 100644  index 57c87c0..4ad41a3 100644
    29  <span class="hl kwb">--- a/hw/xfree86/os-support/linux/systemd-logind.c</span>  --- a/hw/xfree86/os-support/linux/systemd-logind.c
    30  <span class="hl kwa">+++ b/hw/xfree86/os-support/linux/systemd-logind.c</span>  +++ b/hw/xfree86/os-support/linux/systemd-logind.c
    31  <span class="hl kwd">&#64;&#64; -13,62 +13,60 &#64;&#64;</span>  @@ -13,62 +13,60 @@
    32    * Software.    * Software.
    33    *    *
    34    * THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR    * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
    35    * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,    * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
    36    * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL    * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
    37    * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER    * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
    # Line 538  index 57c87c0..4ad41a3 100644 Line 39  index 57c87c0..4ad41a3 100644
    39    * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER    * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
    40    * DEALINGS IN THE SOFTWARE.    * DEALINGS IN THE SOFTWARE.
    41    *    *
    42    * Author: Hans de Goede &lt;hdegoede&#64;redhat.com&gt;    * Author: Hans de Goede <hdegoede@redhat.com>
    43    */    */
    44    
    45   #ifdef HAVE_XORG_CONFIG_H   #ifdef HAVE_XORG_CONFIG_H
    46   #include &lt;xorg-config.h&gt;   #include <xorg-config.h>
    47   #endif   #endif
    48    
    49   #include &lt;dbus/dbus.h&gt;   #include <dbus/dbus.h>
    50   #include &lt;string.h&gt;   #include <string.h>
    51   #include &lt;sys/types.h&gt;   #include <sys/types.h>
    52   #include &lt;unistd.h&gt;   #include <unistd.h>
    53    
    54   #include &quot;os.h&quot;   #include "os.h"
    55   #include &quot;dbus-core.h&quot;   #include "dbus-core.h"
    56   #include &quot;xf86.h&quot;   #include "xf86.h"
    57   #include &quot;xf86platformBus.h&quot;   #include "xf86platformBus.h"
    58   #include &quot;xf86Xinput.h&quot;   #include "xf86Xinput.h"
    59    
    60   #include &quot;systemd-logind.h&quot;   #include "systemd-logind.h"
    61    
    62  <span class="hl kwb">-#define DBUS_TIMEOUT 500 /* Wait max 0.5 seconds */</span>  -#define DBUS_TIMEOUT 500 /* Wait max 0.5 seconds */
    63  <span class="hl kwb">-</span>  -
    64   struct systemd_logind_info {   struct systemd_logind_info {
    65       DBusConnection *conn;       DBusConnection *conn;
    66       char *session;       char *session;
    # Line 575  index 57c87c0..4ad41a3 100644 Line 76  index 57c87c0..4ad41a3 100644
    76   {   {
    77       InputInfoPtr pInfo;       InputInfoPtr pInfo;
    78    
    79       for (pInfo = start; pInfo; pInfo = pInfo-&gt;next)       for (pInfo = start; pInfo; pInfo = pInfo->next)
    80           if (pInfo-&gt;major == major &amp;&amp; pInfo-&gt;minor == minor &amp;&amp;           if (pInfo->major == major && pInfo->minor == minor &&
    81                   (pInfo-&gt;flags &amp; XI86_SERVER_FD))                   (pInfo->flags & XI86_SERVER_FD))
    82               return pInfo;               return pInfo;
    83    
    84       return NULL;       return NULL;
    # Line 590  index 57c87c0..4ad41a3 100644 Line 91  index 57c87c0..4ad41a3 100644
    91       InputInfoPtr pInfo;       InputInfoPtr pInfo;
    92    
    93       pInfo = systemd_logind_find_info_ptr_by_devnum(xf86InputDevs, major, minor);       pInfo = systemd_logind_find_info_ptr_by_devnum(xf86InputDevs, major, minor);
    94  &#64;&#64; -103,61 +101,61 &#64;&#64; systemd_logind_take_fd(int _major, int _minor, const char *path,  @@ -103,61 +101,61 @@ systemd_logind_take_fd(int _major, int _minor, const char *path,
    95       if (strstr(path, &quot;mouse&quot;))       if (strstr(path, "mouse"))
    96           return -1;           return -1;
    97    
    98       /* Check if we already have an InputInfo entry with this major, minor       /* Check if we already have an InputInfo entry with this major, minor
    99        * (shared device-nodes happen ie with Wacom tablets). */        * (shared device-nodes happen ie with Wacom tablets). */
    100       pInfo = systemd_logind_find_info_ptr_by_devnum(xf86InputDevs, major, minor);       pInfo = systemd_logind_find_info_ptr_by_devnum(xf86InputDevs, major, minor);
    101       if (pInfo) {       if (pInfo) {
    102           LogMessage(X_INFO, &quot;systemd-logind: returning pre-existing fd for %s %u:%u\n&quot;,           LogMessage(X_INFO, "systemd-logind: returning pre-existing fd for %s %u:%u\n",
    103                  path, major, minor);                  path, major, minor);
    104           *paused_ret = FALSE;           *paused_ret = FALSE;
    105           return pInfo-&gt;fd;           return pInfo->fd;
    106       }       }
    107    
    108       dbus_error_init(&amp;error);       dbus_error_init(&error);
    109    
    110       msg = dbus_message_new_method_call(&quot;org.freedesktop.login1&quot;, info-&gt;session,       msg = dbus_message_new_method_call("org.freedesktop.login1", info->session,
    111               &quot;org.freedesktop.login1.Session&quot;, &quot;TakeDevice&quot;);               "org.freedesktop.login1.Session", "TakeDevice");
    112       if (!msg) {       if (!msg) {
    113           LogMessage(X_ERROR, &quot;systemd-logind: out of memory\n&quot;);           LogMessage(X_ERROR, "systemd-logind: out of memory\n");
    114           goto cleanup;           goto cleanup;
    115       }       }
    116    
    117       if (!dbus_message_append_args(msg, DBUS_TYPE_UINT32, &amp;major,       if (!dbus_message_append_args(msg, DBUS_TYPE_UINT32, &major,
    118                                          DBUS_TYPE_UINT32, &amp;minor,                                          DBUS_TYPE_UINT32, &minor,
    119                                          DBUS_TYPE_INVALID)) {                                          DBUS_TYPE_INVALID)) {
    120           LogMessage(X_ERROR, &quot;systemd-logind: out of memory\n&quot;);           LogMessage(X_ERROR, "systemd-logind: out of memory\n");
    121           goto cleanup;           goto cleanup;
    122       }       }
    123    
    124       reply = dbus_connection_send_with_reply_and_block(info-&gt;conn, msg,       reply = dbus_connection_send_with_reply_and_block(info->conn, msg,
    125  <span class="hl kwb">-                                                      DBUS_TIMEOUT, &amp;error);</span>  -                                                      DBUS_TIMEOUT, &error);
    126  <span class="hl kwa">+                                                      DBUS_TIMEOUT_USE_DEFAULT, &amp;error);</span>  +                                                      DBUS_TIMEOUT_USE_DEFAULT, &error);
    127       if (!reply) {       if (!reply) {
    128           LogMessage(X_ERROR, &quot;systemd-logind: failed to take device %s: %s\n&quot;,           LogMessage(X_ERROR, "systemd-logind: failed to take device %s: %s\n",
    129                      path, error.message);                      path, error.message);
    130           goto cleanup;           goto cleanup;
    131       }       }
    132    
    133       if (!dbus_message_get_args(reply, &amp;error,       if (!dbus_message_get_args(reply, &error,
    134                                  DBUS_TYPE_UNIX_FD, &amp;fd,                                  DBUS_TYPE_UNIX_FD, &fd,
    135                                  DBUS_TYPE_BOOLEAN, &amp;paused,                                  DBUS_TYPE_BOOLEAN, &paused,
    136                                  DBUS_TYPE_INVALID)) {                                  DBUS_TYPE_INVALID)) {
    137           LogMessage(X_ERROR, &quot;systemd-logind: TakeDevice %s: %s\n&quot;,           LogMessage(X_ERROR, "systemd-logind: TakeDevice %s: %s\n",
    138                      path, error.message);                      path, error.message);
    139           goto cleanup;           goto cleanup;
    140       }       }
    141    
    142       *paused_ret = paused;       *paused_ret = paused;
    143    
    144       LogMessage(X_INFO, &quot;systemd-logind: got fd for %s %u:%u fd %d paused %d\n&quot;,       LogMessage(X_INFO, "systemd-logind: got fd for %s %u:%u fd %d paused %d\n",
    145                  path, major, minor, fd, paused);                  path, major, minor, fd, paused);
    146    
    147   cleanup:   cleanup:
    # Line 648  index 57c87c0..4ad41a3 100644 Line 149  index 57c87c0..4ad41a3 100644
    149           dbus_message_unref(msg);           dbus_message_unref(msg);
    150       if (reply)       if (reply)
    151           dbus_message_unref(reply);           dbus_message_unref(reply);
    152       dbus_error_free(&amp;error);       dbus_error_free(&error);
    153    
    154       return fd;       return fd;
    155   }   }
    156    
    157  &#64;&#64; -180,61 +178,61 &#64;&#64; systemd_logind_release_fd(int _major, int _minor, int fd)  @@ -180,61 +178,61 @@ systemd_logind_release_fd(int _major, int _minor, int fd)
    158        * and minor, otherwise other InputInfo's are still referencing the fd. */        * and minor, otherwise other InputInfo's are still referencing the fd. */
    159       pInfo = systemd_logind_find_info_ptr_by_devnum(xf86InputDevs, major, minor);       pInfo = systemd_logind_find_info_ptr_by_devnum(xf86InputDevs, major, minor);
    160       while (pInfo) {       while (pInfo) {
    161           matches++;           matches++;
    162           pInfo = systemd_logind_find_info_ptr_by_devnum(pInfo-&gt;next, major, minor);           pInfo = systemd_logind_find_info_ptr_by_devnum(pInfo->next, major, minor);
    163       }       }
    164       if (matches &gt; 1) {       if (matches > 1) {
    165           LogMessage(X_INFO, &quot;systemd-logind: not releasing fd for %u:%u, still in use\n&quot;, major, minor);           LogMessage(X_INFO, "systemd-logind: not releasing fd for %u:%u, still in use\n", major, minor);
    166           return;           return;
    167       }       }
    168    
    169       LogMessage(X_INFO, &quot;systemd-logind: releasing fd for %u:%u\n&quot;, major, minor);       LogMessage(X_INFO, "systemd-logind: releasing fd for %u:%u\n", major, minor);
    170    
    171       dbus_error_init(&amp;error);       dbus_error_init(&error);
    172    
    173       msg = dbus_message_new_method_call(&quot;org.freedesktop.login1&quot;, info-&gt;session,       msg = dbus_message_new_method_call("org.freedesktop.login1", info->session,
    174               &quot;org.freedesktop.login1.Session&quot;, &quot;ReleaseDevice&quot;);               "org.freedesktop.login1.Session", "ReleaseDevice");
    175       if (!msg) {       if (!msg) {
    176           LogMessage(X_ERROR, &quot;systemd-logind: out of memory\n&quot;);           LogMessage(X_ERROR, "systemd-logind: out of memory\n");
    177           goto cleanup;           goto cleanup;
    178       }       }
    179    
    180       if (!dbus_message_append_args(msg, DBUS_TYPE_UINT32, &amp;major,       if (!dbus_message_append_args(msg, DBUS_TYPE_UINT32, &major,
    181                                          DBUS_TYPE_UINT32, &amp;minor,                                          DBUS_TYPE_UINT32, &minor,
    182                                          DBUS_TYPE_INVALID)) {                                          DBUS_TYPE_INVALID)) {
    183           LogMessage(X_ERROR, &quot;systemd-logind: out of memory\n&quot;);           LogMessage(X_ERROR, "systemd-logind: out of memory\n");
    184           goto cleanup;           goto cleanup;
    185       }       }
    186    
    187       reply = dbus_connection_send_with_reply_and_block(info-&gt;conn, msg,       reply = dbus_connection_send_with_reply_and_block(info->conn, msg,
    188  <span class="hl kwb">-                                                      DBUS_TIMEOUT, &amp;error);</span>  -                                                      DBUS_TIMEOUT, &error);
    189  <span class="hl kwa">+                                                      DBUS_TIMEOUT_USE_DEFAULT, &amp;error);</span>  +                                                      DBUS_TIMEOUT_USE_DEFAULT, &error);
    190       if (!reply)       if (!reply)
    191           LogMessage(X_ERROR, &quot;systemd-logind: failed to release device: %s\n&quot;,           LogMessage(X_ERROR, "systemd-logind: failed to release device: %s\n",
    192                      error.message);                      error.message);
    193    
    194   cleanup:   cleanup:
    # Line 695  index 57c87c0..4ad41a3 100644 Line 196  index 57c87c0..4ad41a3 100644
    196           dbus_message_unref(msg);           dbus_message_unref(msg);
    197       if (reply)       if (reply)
    198           dbus_message_unref(reply);           dbus_message_unref(reply);
    199       dbus_error_free(&amp;error);       dbus_error_free(&error);
    200   close:   close:
    201       if (fd != -1)       if (fd != -1)
    202           close(fd);           close(fd);
    # Line 710  index 57c87c0..4ad41a3 100644 Line 211  index 57c87c0..4ad41a3 100644
    211   void   void
    212   systemd_logind_vtenter(void)   systemd_logind_vtenter(void)
    213   {   {
    214       struct systemd_logind_info *info = &amp;logind_info;       struct systemd_logind_info *info = &logind_info;
    215       InputInfoPtr pInfo;       InputInfoPtr pInfo;
    216       int i;       int i;
    217    
    218       if (!info-&gt;session)       if (!info->session)
    219           return; /* Not using systemd-logind */           return; /* Not using systemd-logind */
    220  &#64;&#64; -262,61 +260,61 &#64;&#64; systemd_logind_vtenter(void)  @@ -262,61 +260,61 @@ systemd_logind_vtenter(void)
    221    
    222       /* Do delayed input probing, this must be done after the above enabling */       /* Do delayed input probing, this must be done after the above enabling */
    223       xf86InputEnableVTProbe();       xf86InputEnableVTProbe();
    # Line 730  index 57c87c0..4ad41a3 100644 Line 231  index 57c87c0..4ad41a3 100644
    231       DBusMessage *msg = NULL;       DBusMessage *msg = NULL;
    232       DBusMessage *reply = NULL;       DBusMessage *reply = NULL;
    233    
    234       dbus_error_init(&amp;error);       dbus_error_init(&error);
    235    
    236       msg = dbus_message_new_method_call(&quot;org.freedesktop.login1&quot;, info-&gt;session,       msg = dbus_message_new_method_call("org.freedesktop.login1", info->session,
    237               &quot;org.freedesktop.login1.Session&quot;, &quot;PauseDeviceComplete&quot;);               "org.freedesktop.login1.Session", "PauseDeviceComplete");
    238       if (!msg) {       if (!msg) {
    239           LogMessage(X_ERROR, &quot;systemd-logind: out of memory\n&quot;);           LogMessage(X_ERROR, "systemd-logind: out of memory\n");
    240           goto cleanup;           goto cleanup;
    241       }       }
    242    
    243       if (!dbus_message_append_args(msg, DBUS_TYPE_UINT32, &amp;major,       if (!dbus_message_append_args(msg, DBUS_TYPE_UINT32, &major,
    244                                          DBUS_TYPE_UINT32, &amp;minor,                                          DBUS_TYPE_UINT32, &minor,
    245                                          DBUS_TYPE_INVALID)) {                                          DBUS_TYPE_INVALID)) {
    246           LogMessage(X_ERROR, &quot;systemd-logind: out of memory\n&quot;);           LogMessage(X_ERROR, "systemd-logind: out of memory\n");
    247           goto cleanup;           goto cleanup;
    248       }       }
    249    
    250       reply = dbus_connection_send_with_reply_and_block(info-&gt;conn, msg,       reply = dbus_connection_send_with_reply_and_block(info->conn, msg,
    251  <span class="hl kwb">-                                                      DBUS_TIMEOUT, &amp;error);</span>  -                                                      DBUS_TIMEOUT, &error);
    252  <span class="hl kwa">+                                                      DBUS_TIMEOUT_USE_DEFAULT, &amp;error);</span>  +                                                      DBUS_TIMEOUT_USE_DEFAULT, &error);
    253       if (!reply)       if (!reply)
    254           LogMessage(X_ERROR, &quot;systemd-logind: failed to ack pause: %s\n&quot;,           LogMessage(X_ERROR, "systemd-logind: failed to ack pause: %s\n",
    255                      error.message);                      error.message);
    256    
    257   cleanup:   cleanup:
    # Line 758  index 57c87c0..4ad41a3 100644 Line 259  index 57c87c0..4ad41a3 100644
    259           dbus_message_unref(msg);           dbus_message_unref(msg);
    260       if (reply)       if (reply)
    261           dbus_message_unref(reply);           dbus_message_unref(reply);
    262       dbus_error_free(&amp;error);       dbus_error_free(&error);
    263   }   }
    264    
    265   static DBusHandlerResult   static DBusHandlerResult
    # Line 775  index 57c87c0..4ad41a3 100644 Line 276  index 57c87c0..4ad41a3 100644
    276       if (dbus_message_get_type (message) != DBUS_MESSAGE_TYPE_SIGNAL)       if (dbus_message_get_type (message) != DBUS_MESSAGE_TYPE_SIGNAL)
    277           return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;           return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
    278    
    279       dbus_error_init(&amp;error);       dbus_error_init(&error);
    280    
    281       if (dbus_message_is_signal(message,       if (dbus_message_is_signal(message,
    282                                  &quot;org.freedesktop.DBus&quot;, &quot;NameOwnerChanged&quot;)) {                                  "org.freedesktop.DBus", "NameOwnerChanged")) {
    283  &#64;&#64; -430,96 +428,96 &#64;&#64; message_filter(DBusConnection * connection, DBusMessage * message, void *data)  @@ -430,96 +428,96 @@ message_filter(DBusConnection * connection, DBusMessage * message, void *data)
    284   }   }
    285    
    286   static void   static void
    # Line 792  index 57c87c0..4ad41a3 100644 Line 293  index 57c87c0..4ad41a3 100644
    293       dbus_int32_t arg;       dbus_int32_t arg;
    294       char *session = NULL;       char *session = NULL;
    295    
    296       dbus_error_init(&amp;error);       dbus_error_init(&error);
    297    
    298       msg = dbus_message_new_method_call(&quot;org.freedesktop.login1&quot;,       msg = dbus_message_new_method_call("org.freedesktop.login1",
    299               &quot;/org/freedesktop/login1&quot;, &quot;org.freedesktop.login1.Manager&quot;,               "/org/freedesktop/login1", "org.freedesktop.login1.Manager",
    300               &quot;GetSessionByPID&quot;);               "GetSessionByPID");
    301       if (!msg) {       if (!msg) {
    302           LogMessage(X_ERROR, &quot;systemd-logind: out of memory\n&quot;);           LogMessage(X_ERROR, "systemd-logind: out of memory\n");
    303           goto cleanup;           goto cleanup;
    304       }       }
    305    
    306       arg = getpid();       arg = getpid();
    307       if (!dbus_message_append_args(msg, DBUS_TYPE_UINT32, &amp;arg,       if (!dbus_message_append_args(msg, DBUS_TYPE_UINT32, &arg,
    308                                     DBUS_TYPE_INVALID)) {                                     DBUS_TYPE_INVALID)) {
    309           LogMessage(X_ERROR, &quot;systemd-logind: out of memory\n&quot;);           LogMessage(X_ERROR, "systemd-logind: out of memory\n");
    310           goto cleanup;           goto cleanup;
    311       }       }
    312    
    313       reply = dbus_connection_send_with_reply_and_block(connection, msg,       reply = dbus_connection_send_with_reply_and_block(connection, msg,
    314  <span class="hl kwb">-                                                      DBUS_TIMEOUT, &amp;error);</span>  -                                                      DBUS_TIMEOUT, &error);
    315  <span class="hl kwa">+                                                      DBUS_TIMEOUT_USE_DEFAULT, &amp;error);</span>  +                                                      DBUS_TIMEOUT_USE_DEFAULT, &error);
    316       if (!reply) {       if (!reply) {
    317           LogMessage(X_ERROR, &quot;systemd-logind: failed to get session: %s\n&quot;,           LogMessage(X_ERROR, "systemd-logind: failed to get session: %s\n",
    318                      error.message);                      error.message);
    319           goto cleanup;           goto cleanup;
    320       }       }
    321       dbus_message_unref(msg);       dbus_message_unref(msg);
    322    
    323       if (!dbus_message_get_args(reply, &amp;error, DBUS_TYPE_OBJECT_PATH, &amp;session,       if (!dbus_message_get_args(reply, &error, DBUS_TYPE_OBJECT_PATH, &session,
    324                                  DBUS_TYPE_INVALID)) {                                  DBUS_TYPE_INVALID)) {
    325           LogMessage(X_ERROR, &quot;systemd-logind: GetSessionByPID: %s\n&quot;,           LogMessage(X_ERROR, "systemd-logind: GetSessionByPID: %s\n",
    326                      error.message);                      error.message);
    327           goto cleanup;           goto cleanup;
    328       }       }
    # Line 831  index 57c87c0..4ad41a3 100644 Line 332  index 57c87c0..4ad41a3 100644
    332       reply = NULL;       reply = NULL;
    333    
    334    
    335       msg = dbus_message_new_method_call(&quot;org.freedesktop.login1&quot;,       msg = dbus_message_new_method_call("org.freedesktop.login1",
    336               session, &quot;org.freedesktop.login1.Session&quot;, &quot;TakeControl&quot;);               session, "org.freedesktop.login1.Session", "TakeControl");
    337       if (!msg) {       if (!msg) {
    338           LogMessage(X_ERROR, &quot;systemd-logind: out of memory\n&quot;);           LogMessage(X_ERROR, "systemd-logind: out of memory\n");
    339           goto cleanup;           goto cleanup;
    340       }       }
    341    
    342       arg = FALSE; /* Don't forcibly take over over the session */       arg = FALSE; /* Don't forcibly take over over the session */
    343       if (!dbus_message_append_args(msg, DBUS_TYPE_BOOLEAN, &amp;arg,       if (!dbus_message_append_args(msg, DBUS_TYPE_BOOLEAN, &arg,
    344                                     DBUS_TYPE_INVALID)) {                                     DBUS_TYPE_INVALID)) {
    345           LogMessage(X_ERROR, &quot;systemd-logind: out of memory\n&quot;);           LogMessage(X_ERROR, "systemd-logind: out of memory\n");
    346           goto cleanup;           goto cleanup;
    347       }       }
    348    
    349       reply = dbus_connection_send_with_reply_and_block(connection, msg,       reply = dbus_connection_send_with_reply_and_block(connection, msg,
    350  <span class="hl kwb">-                                                      DBUS_TIMEOUT, &amp;error);</span>  -                                                      DBUS_TIMEOUT, &error);
    351  <span class="hl kwa">+                                                      DBUS_TIMEOUT_USE_DEFAULT, &amp;error);</span>  +                                                      DBUS_TIMEOUT_USE_DEFAULT, &error);
    352       if (!reply) {       if (!reply) {
    353           LogMessage(X_ERROR, &quot;systemd-logind: TakeControl failed: %s\n&quot;,           LogMessage(X_ERROR, "systemd-logind: TakeControl failed: %s\n",
    354                      error.message);                      error.message);
    355           goto cleanup;           goto cleanup;
    356       }       }
    357    
    358       dbus_bus_add_match(connection,       dbus_bus_add_match(connection,
    359           &quot;type='signal',sender='org.freedesktop.DBus',interface='org.freedesktop.DBus',member='NameOwnerChanged',path='/org/freedesktop/DBus'&quot;,           "type='signal',sender='org.freedesktop.DBus',interface='org.freedesktop.DBus',member='NameOwnerChanged',path='/org/freedesktop/DBus'",
    360           &amp;error);           &error);
    361       if (dbus_error_is_set(&amp;error)) {       if (dbus_error_is_set(&error)) {
    362           LogMessage(X_ERROR, &quot;systemd-logind: could not add match: %s\n&quot;,           LogMessage(X_ERROR, "systemd-logind: could not add match: %s\n",
    363                      error.message);                      error.message);
    364           goto cleanup;           goto cleanup;
    365       }       }
    366    
    367       /*       /*
    368        * HdG: This is not useful with systemd &lt;= 208 since the signal only        * HdG: This is not useful with systemd <= 208 since the signal only
    369        * contains invalidated property names there, rather than property, val        * contains invalidated property names there, rather than property, val
    370        * pairs as it should.  Instead we just use the first resume / pause now.        * pairs as it should.  Instead we just use the first resume / pause now.
    371        */        */
    372   #if 0   #if 0
    373       snprintf(match, sizeof(match),       snprintf(match, sizeof(match),
    374           &quot;type='signal',sender='org.freedesktop.login1',interface='org.freedesktop.DBus.Properties',member='PropertiesChanged',path='%s'&quot;,           "type='signal',sender='org.freedesktop.login1',interface='org.freedesktop.DBus.Properties',member='PropertiesChanged',path='%s'",
    375           session);           session);
    376       dbus_bus_add_match(connection, match, &amp;error);       dbus_bus_add_match(connection, match, &error);
    377       if (dbus_error_is_set(&amp;error)) {       if (dbus_error_is_set(&error)) {
    378           LogMessage(X_ERROR, &quot;systemd-logind: could not add match: %s\n&quot;,           LogMessage(X_ERROR, "systemd-logind: could not add match: %s\n",
    379                      error.message);                      error.message);
    380           goto cleanup;           goto cleanup;
    381       }       }
    382  &#64;&#64; -537,61 +535,61 &#64;&#64; connect_hook(DBusConnection *connection, void *data)  @@ -537,61 +535,61 @@ connect_hook(DBusConnection *connection, void *data)
    383       info-&gt;session = session;       info->session = session;
    384       info-&gt;vt_active = info-&gt;active = TRUE; /* The server owns the vt during init */       info->vt_active = info->active = TRUE; /* The server owns the vt during init */
    385       session = NULL;       session = NULL;
    386    
    387   cleanup:   cleanup:
    # Line 889  index 57c87c0..4ad41a3 100644 Line 390  index 57c87c0..4ad41a3 100644
    390           dbus_message_unref(msg);           dbus_message_unref(msg);
    391       if (reply)       if (reply)
    392           dbus_message_unref(reply);           dbus_message_unref(reply);
    393       dbus_error_free(&amp;error);       dbus_error_free(&error);
    394   }   }
    395    
    396   static void   static void
    # Line 899  index 57c87c0..4ad41a3 100644 Line 400  index 57c87c0..4ad41a3 100644
    400       DBusMessage *msg = NULL;       DBusMessage *msg = NULL;
    401       DBusMessage *reply = NULL;       DBusMessage *reply = NULL;
    402    
    403       dbus_error_init(&amp;error);       dbus_error_init(&error);
    404    
    405       msg = dbus_message_new_method_call(&quot;org.freedesktop.login1&quot;,       msg = dbus_message_new_method_call("org.freedesktop.login1",
    406               info-&gt;session, &quot;org.freedesktop.login1.Session&quot;, &quot;ReleaseControl&quot;);               info->session, "org.freedesktop.login1.Session", "ReleaseControl");
    407       if (!msg) {       if (!msg) {
    408           LogMessage(X_ERROR, &quot;systemd-logind: out of memory\n&quot;);           LogMessage(X_ERROR, "systemd-logind: out of memory\n");
    409           goto cleanup;           goto cleanup;
    410       }       }
    411    
    412       reply = dbus_connection_send_with_reply_and_block(info-&gt;conn, msg,       reply = dbus_connection_send_with_reply_and_block(info->conn, msg,
    413  <span class="hl kwb">-                                                      DBUS_TIMEOUT, &amp;error);</span>  -                                                      DBUS_TIMEOUT, &error);
    414  <span class="hl kwa">+                                                      DBUS_TIMEOUT_USE_DEFAULT, &amp;error);</span>  +                                                      DBUS_TIMEOUT_USE_DEFAULT, &error);
    415       if (!reply) {       if (!reply) {
    416           LogMessage(X_ERROR, &quot;systemd-logind: ReleaseControl failed: %s\n&quot;,           LogMessage(X_ERROR, "systemd-logind: ReleaseControl failed: %s\n",
    417                      error.message);                      error.message);
    418           goto cleanup;           goto cleanup;
    419       }       }
    # Line 922  index 57c87c0..4ad41a3 100644 Line 423  index 57c87c0..4ad41a3 100644
    423           dbus_message_unref(msg);           dbus_message_unref(msg);
    424       if (reply)       if (reply)
    425           dbus_message_unref(reply);           dbus_message_unref(reply);
    426       dbus_error_free(&amp;error);       dbus_error_free(&error);
    427   }   }
    428    
    429   static void   static void
    # Line 930  index 57c87c0..4ad41a3 100644 Line 431  index 57c87c0..4ad41a3 100644
    431   {   {
    432       struct systemd_logind_info *info = data;       struct systemd_logind_info *info = data;
    433    
    434       free(info-&gt;session);       free(info->session);
    435       info-&gt;session = NULL;       info->session = NULL;
    436       info-&gt;conn = NULL;       info->conn = NULL;
    437   }   }
    438    
    439   static struct dbus_core_hook core_hook = {   static struct dbus_core_hook core_hook = {
    440       .connect = connect_hook,       .connect = connect_hook,
    441       .disconnect = disconnect_hook,       .disconnect = disconnect_hook,
    442       .data = &amp;logind_info,       .data = &logind_info,
    443   };   };
    444    
    445  <span class="hl kwb">-- </span>  --
    446  2.3.3  2.3.3
     </code></pre></td></tr></table>  
     </div> <!-- class=content -->  
     <div class="foot" style="padding-left:1em;padding-right:1em;">  
     <p>Copyright &copy; 2002-2014 <a href="mailto:jvinet@zeroflux.org"  
     title="contact Judd Vinet">Judd Vinet</a> and <a href="mailto:aaron@archlinux.org"  
     title="contact Aaron Griffin">Aaron Griffin</a>. The Arch Linux name and logo  
     are recognized trademarks. Some rights reserved. The registered trademark  
     Linux&reg; is used pursuant to a sublicense from LMI, the exclusive licensee  
     of Linus Torvalds, owner of the mark on a world-wide basis.</p>  
     </div>  
     </div> <!-- id=cgit -->  
     </body>  
     </html>  
    Legend:
    Removed from v.2575  
    changed lines
      Added in v.2576