PageRenderTime 51ms CodeModel.GetById 22ms RepoModel.GetById 1ms app.codeStats 0ms

/giver-0.1.8-username_face.patch

#
Patch | 335 lines | 318 code | 17 blank | 0 comment | 0 complexity | 82629e2ba12399bb2f7f23e99f7432d9 MD5 | raw file
    

  1. diff -up giver-0.1.8/src/GiverService.cs.username_face giver-0.1.8/src/GiverService.cs
    2. 

  2. --- giver-0.1.8/src/GiverService.cs.username_face	2007-08-03 01:17:45.000000000 -0400
    3. 

  3. +++ giver-0.1.8/src/GiverService.cs	2008-12-02 14:48:39.000000000 -0500
    4. 

  4. @@ -128,6 +128,12 @@ namespace Giver
    5. 

  5.  													"Version=" + Defines.Version,
    6. 

  6.  													"PhotoType=" + Preferences.Local,
    7. 

  7.  													"Photo=none" };
    8. 

  8. +                    } else if (Application.Preferences.PhotoType.CompareTo(Preferences.UserFace) == 0) {
    9. 

  9. +						txtStrings = new string[] { "User Name=" + Application.Preferences.UserName, 
    10. 

  10. +													"Machine Name=" + Environment.MachineName, 
    11. 

  11. +													"Version=" + Defines.Version,
    12. 

  12. +													"PhotoType=" + Preferences.UserFace,
    13. 

  13. +													"Photo=none" };	
    14. 

  14.  					} else if( Application.Preferences.PhotoType.CompareTo(Preferences.Gravatar) == 0) {
    15. 

  15.  						txtStrings = new string[] { "User Name=" + Application.Preferences.UserName, 
    16. 

  16.  													"Machine Name=" + Environment.MachineName, 
    17. 

  17. diff -up giver-0.1.8/src/PhotoService.cs.username_face giver-0.1.8/src/PhotoService.cs
    18. 

  18. --- giver-0.1.8/src/PhotoService.cs.username_face	2007-08-03 01:18:10.000000000 -0400
    19. 

  19. +++ giver-0.1.8/src/PhotoService.cs	2008-12-02 14:48:39.000000000 -0500
    20. 

  20. @@ -92,7 +92,8 @@ namespace Giver
    21. 

  21.  
    22. 

  22.  				Logger.Debug ("Resolving photo for: {0}", serviceInfo.UserName);
    23. 

  23.  				try {
    24. 

  24. -					if (serviceInfo.PhotoType.CompareTo(Preferences.Local) == 0 ) {
    25. 

  25. +					if (serviceInfo.PhotoType.CompareTo(Preferences.Local) == 0 || 
    26. 

  26. +                        serviceInfo.PhotoType.CompareTo(Preferences.UserFace) == 0) {
    27. 

  27.  						SendingHandler.GetPhoto (serviceInfo);
    28. 

  28.  						serviceInfo.Photo = serviceInfo.Photo.ScaleSimple(48, 48, Gdk.InterpType.Bilinear);
    29. 

  29.  					} else if (serviceInfo.PhotoType.CompareTo (Preferences.Gravatar) == 0 ){
    30. 

  30. diff -up giver-0.1.8/src/Preferences.cs.username_face giver-0.1.8/src/Preferences.cs
    31. 

  31. --- giver-0.1.8/src/Preferences.cs.username_face	2007-08-03 01:18:25.000000000 -0400
    32. 

  32. +++ giver-0.1.8/src/Preferences.cs	2008-12-02 14:48:39.000000000 -0500
    33. 

  33. @@ -38,6 +38,7 @@ namespace Giver
    34. 

  34.  	public class Preferences
    35. 

  35.  	{
    36. 

  36.  		public const string None = "none";
    37. 

  37. +        public const string UserFace = "face";
    38. 

  38.  		public const string Local = "local";
    39. 

  39.  		public const string Gravatar = "gravatar";
    40. 

  40.  		public const string Uri = "uri";
    41. 

  41. @@ -55,9 +56,21 @@ namespace Giver
    42. 

  42.  				XmlNodeList list = document.GetElementsByTagName("PhotoType");
    43. 

  43.  				XmlElement element = (XmlElement) list[0];
    44. 

  44.  				if(element == null)
    45. 

  45. -					return Preferences.None;
    46. 

  46. -				else
    47. 

  47. +                {
    48. 

  48. +                    if (Utilities.UserFaceExists())
    49. 

  49. +                        return Preferences.UserFace;
    50. 

  50. +                    else
    51. 

  51. +					    return Preferences.None;
    52. 

  52. +                }
    53. 

  53. +				else
    54. 

  54. +                {
    55. 

  55. +                    if (element.InnerText.CompareTo(Preferences.UserFace) == 0 && !Utilities.UserFaceExists())
    56. 

  56. +                    {
    57. 

  57. +                        element.InnerText = Preferences.None;
    58. 

  58. +                        SavePrefs();
    59. 

  59. +                    }
    60. 

  60.  					return element.InnerText;
    61. 

  61. +                }
    62. 

  62.  			}
    63. 

  63.  			
    64. 

  64.  			set
    65. 

  65. @@ -98,7 +111,6 @@ namespace Giver
    66. 

  66.  			}
    67. 

  67.  		}
    68. 

  68.  
    69. 

  69. -
    70. 

  70.  		public string UserName
    71. 

  71.  		{
    72. 

  72.  			get
    73. 

  73. @@ -106,7 +118,7 @@ namespace Giver
    74. 

  74.  				XmlNodeList list = document.GetElementsByTagName("UserName");
    75. 

  75.  				XmlElement element = (XmlElement) list[0];
    76. 

  76.  				if( (element == null) || (element.InnerText.Length < 1) )
    77. 

  77. -					return Environment.UserName;
    78. 

  78. +					return Utilities.GetUserName();
    79. 

  79.  				else
    80. 

  80.  					return element.InnerText;
    81. 

  81.  			}
    82. 

  82. @@ -120,7 +132,7 @@ namespace Giver
    83. 

  83.  					document.DocumentElement.AppendChild(element);
    84. 

  84.  				}
    85. 

  85.  				if(value == null)
    86. 

  86. -					element.InnerText = Environment.UserName; 
    87. 

  87. +					element.InnerText = Utilities.GetUserName(); 
    88. 

  88.  				else
    89. 

  89.  					element.InnerText = value; 
    90. 

  90.  				SavePrefs();
    91. 

  91. diff -up giver-0.1.8/src/PreferencesDialog.cs.username_face giver-0.1.8/src/PreferencesDialog.cs
    92. 

  92. --- giver-0.1.8/src/PreferencesDialog.cs.username_face	2007-08-03 01:33:12.000000000 -0400
    93. 

  93. +++ giver-0.1.8/src/PreferencesDialog.cs	2008-12-02 14:48:39.000000000 -0500
    94. 

  94. @@ -38,6 +38,7 @@ namespace Giver
    95. 

  95.  		private FileChooserButton	fileLocationButton;
    96. 

  96.  		private Gtk.Entry 			nameEntry;
    97. 

  97.  		private Gtk.RadioButton		noneButton;
    98. 

  98. +		private Gtk.RadioButton		faceButton;
    99. 

  99.  		private Gtk.RadioButton		localButton;
    100. 

  100.  		private Gtk.RadioButton		webButton;
    101. 

  101.  		private Gtk.RadioButton		gravatarButton;
    102. 

  102. @@ -114,7 +115,7 @@ namespace Giver
    103. 

  103.  			label.Markup = "<span weight=\"bold\" size=\"large\">Your Picture</span>";
    104. 

  104.  			mainVBox.PackStart(label, true, true, 0);
    105. 

  105.  		
    106. 

  106. -			Gtk.Table table = new Table(4, 3, false);
    107. 

  107. +			Gtk.Table table = new Table(5, 3, false);
    108. 

  108.  			table.Show();
    109. 

  109.  			// None Entry
    110. 

  110.  			noneButton = new RadioButton((Gtk.RadioButton)null);
    111. 

  111. @@ -133,10 +134,36 @@ namespace Giver
    112. 

  112.  			vbox.Show();
    113. 

  113.  			table.Attach(vbox, 2,3,1,2, AttachOptions.Expand | AttachOptions.Fill, AttachOptions.Expand | AttachOptions.Fill, 0, 0);
    114. 

  114.  
    115. 

  115. +            // Face Entry
    116. 

  116. +            if (Utilities.UserFaceExists())
    117. 

  117. +            {
    118. 

  118. +                
    119. 

  119. +    			faceButton = new RadioButton(noneButton);
    120. 

  120. +    			faceButton.Show();
    121. 

  121. +    			table.Attach(faceButton, 0, 1, 1, 2, AttachOptions.Shrink, AttachOptions.Shrink, 0, 0);
    122. 

  122. +                
    123. 

  123. +    			vbox = new VBox();
    124. 

  124. +    			vbox.Show();
    125. 

  125. +                
    126. 

  126. +    			image = new Image(Utilities.GetUserFaceIcon(48));
    127. 

  127. +    			image.Show();
    128. 

  128. +    			vbox.PackStart(image, false, false, 0);
    129. 

  129. +                
    130. 

  130. +    			label = new Label("Login photo");
    131. 

  131. +    			label.Show();
    132. 

  132. +    			vbox.PackStart(label, false, false, 0);
    133. 

  133. +    			table.Attach(vbox, 1, 2, 1 ,2, AttachOptions.Shrink, AttachOptions.Shrink, 0, 0);
    134. 

  134. +                
    135. 

  135. +    			vbox = new VBox();
    136. 

  136. +    			vbox.Show();
    137. 

  137. +    			table.Attach(vbox, 2,3,2,3, AttachOptions.Expand | AttachOptions.Fill, AttachOptions.Expand | AttachOptions.Fill, 0, 0);
    138. 

  138. +
    139. 

  139. +            }
    140. 

  140. +            
    141. 

  141.  			// Local Entry
    142. 

  142. -			localButton = new RadioButton(noneButton);
    143. 

  143. +			localButton = new RadioButton(faceButton ?? noneButton);
    144. 

  144.  			localButton.Show();
    145. 

  145. -			table.Attach(localButton, 0, 1, 1, 2, AttachOptions.Shrink, AttachOptions.Shrink, 0, 0);
    146. 

  146. +			table.Attach(localButton, 0, 1, 2, 3, AttachOptions.Shrink, AttachOptions.Shrink, 0, 0);
    147. 

  147.  			vbox = new VBox();
    148. 

  148.  			vbox.Show();
    149. 

  149.  			localImage = new Image(Utilities.GetIcon("stock_person", 48));
    150. 

  150. @@ -145,15 +172,15 @@ namespace Giver
    151. 

  151.  			label = new Label("File");
    152. 

  152.  			label.Show();
    153. 

  153.  			vbox.PackStart(label, false, false, 0);
    154. 

  154. -			table.Attach(vbox, 1, 2, 1 ,2, AttachOptions.Shrink, AttachOptions.Shrink, 0, 0);
    155. 

  155. +			table.Attach(vbox, 1, 2, 2 ,3, AttachOptions.Shrink, AttachOptions.Shrink, 0, 0);
    156. 

  156.  			photoButton = new Button("Change Photo");
    157. 

  157.  			photoButton.Show();
    158. 

  158. -			table.Attach(photoButton, 2,3,1,2, AttachOptions.Expand | AttachOptions.Fill, AttachOptions.Shrink, 0, 0);
    159. 

  159. +			table.Attach(photoButton, 2,3,2,3, AttachOptions.Expand | AttachOptions.Fill, AttachOptions.Shrink, 0, 0);
    160. 

  160.  
    161. 

  161.  			// Web Entry
    162. 

  162.  			webButton = new RadioButton(noneButton);
    163. 

  163.  			webButton.Show();
    164. 

  164. -			table.Attach(webButton, 0, 1, 2, 3, AttachOptions.Shrink, AttachOptions.Shrink, 0, 0);
    165. 

  165. +			table.Attach(webButton, 0, 1, 3, 4, AttachOptions.Shrink, AttachOptions.Shrink, 0, 0);
    166. 

  166.  			vbox = new VBox();
    167. 

  167.  			vbox.Show();
    168. 

  168.  			image = new Image(Utilities.GetIcon("web-browser", 48));
    169. 

  169. @@ -162,15 +189,15 @@ namespace Giver
    170. 

  170.  			label = new Label("Web Link");
    171. 

  171.  			label.Show();
    172. 

  172.  			vbox.PackStart(label, false, false, 0);
    173. 

  173. -			table.Attach(vbox, 1, 2, 2 ,3, AttachOptions.Shrink, AttachOptions.Shrink, 0, 0);
    174. 

  174. +			table.Attach(vbox, 1, 2, 3, 4, AttachOptions.Shrink, AttachOptions.Shrink, 0, 0);
    175. 

  175.  			webEntry = new Entry();
    176. 

  176.  			webEntry.Show();
    177. 

  177. -			table.Attach(webEntry, 2,3,2,3, AttachOptions.Expand | AttachOptions.Fill, AttachOptions.Expand | AttachOptions.Fill, 0, 0);
    178. 

  178. +			table.Attach(webEntry, 2,3,3,4, AttachOptions.Expand | AttachOptions.Fill, AttachOptions.Expand | AttachOptions.Fill, 0, 0);
    179. 

  179.  
    180. 

  180.  			// Gravatar Entry
    181. 

  181.  			gravatarButton = new RadioButton(noneButton);
    182. 

  182.  			gravatarButton.Show();
    183. 

  183. -			table.Attach(gravatarButton, 0, 1, 3, 4, AttachOptions.Shrink, AttachOptions.Shrink, 0, 0);
    184. 

  184. +			table.Attach(gravatarButton, 0, 1, 4, 5, AttachOptions.Shrink, AttachOptions.Shrink, 0, 0);
    185. 

  185.  			vbox = new VBox();
    186. 

  186.  			vbox.Show();
    187. 

  187.  			image = new Image(Utilities.GetIcon("gravatar", 48));
    188. 

  188. @@ -179,10 +206,10 @@ namespace Giver
    189. 

  189.  			label = new Label("Gravatar");
    190. 

  190.  			label.Show();
    191. 

  191.  			vbox.PackStart(label, false, false, 0);
    192. 

  192. -			table.Attach(vbox, 1, 2, 3 ,4, AttachOptions.Shrink, AttachOptions.Shrink, 0, 0);
    193. 

  193. +			table.Attach(vbox, 1, 2, 4 ,5, AttachOptions.Shrink, AttachOptions.Shrink, 0, 0);
    194. 

  194.  			gravatarEntry = new Entry();
    195. 

  195.  			gravatarEntry.Show();
    196. 

  196. -			table.Attach(gravatarEntry, 2,3,3,4, AttachOptions.Expand | AttachOptions.Fill, AttachOptions.Expand | AttachOptions.Fill, 0, 0);
    197. 

  197. +			table.Attach(gravatarEntry, 2,3,4,5, AttachOptions.Expand | AttachOptions.Fill, AttachOptions.Expand | AttachOptions.Fill, 0, 0);
    198. 

  198.  
    199. 

  199.  			mainVBox.PackStart(table, true, true, 0);
    200. 

  200.  
    201. 

  201. @@ -237,6 +264,8 @@ namespace Giver
    202. 

  202.  				photoButton
    203. 

  203.  				localImage
    204. 

  204.  */
    205. 

  205. +            } else if (Giver.Application.Preferences.PhotoType.CompareTo(Giver.Preferences.UserFace) == 0) {
    206. 

  206. +                faceButton.Active = true;
    207. 

  207.  			} else if(Giver.Application.Preferences.PhotoType.CompareTo(Giver.Preferences.Uri) == 0) {
    208. 

  208.  				webButton.Active = true;
    209. 

  209.  				webEntry.Text = Giver.Application.Preferences.PhotoLocation;
    210. 

  210. @@ -246,7 +275,13 @@ namespace Giver
    211. 

  211.  				gravatarEntry.Text = Giver.Application.Preferences.PhotoLocation;
    212. 

  212.  			} else {
    213. 

  213.  				// make this none
    214. 

  214. -				noneButton.Active = true;
    215. 

  215. +                if (Utilities.UserFaceExists())
    216. 

  216. +                {
    217. 

  217. +                    faceButton.Active = true;
    218. 

  218. +                    Giver.Application.Preferences.PhotoType = Preferences.UserFace;
    219. 

  219. +                }
    220. 

  220. +                else
    221. 

  221. +				    noneButton.Active = true;
    222. 

  222.  			}
    223. 

  223.  		}
    224. 

  224.  
    225. 

  225. @@ -271,6 +306,17 @@ namespace Giver
    226. 

  226.  				}
    227. 

  227.  			};
    228. 

  228.  
    229. 

  229. +            if (faceButton != null)
    230. 

  230. +                faceButton.Toggled += delegate {
    231. 

  231. +                    if (faceButton.Active)
    232. 

  232. +                    {
    233. 

  233. +                        Application.Preferences.PhotoType = Preferences.UserFace;
    234. 

  234. +    					photoButton.Sensitive = false;
    235. 

  235. +    					webEntry.Sensitive = false;
    236. 

  236. +    					gravatarEntry.Sensitive = false;
    237. 

  237. +                    }
    238. 

  238. +                };
    239. 

  239. +            
    240. 

  240.  			localButton.Toggled += delegate {
    241. 

  241.  				if(localButton.Active)
    242. 

  242.  				{
    243. 

  243. diff -up giver-0.1.8/src/RequestHandler.cs.username_face giver-0.1.8/src/RequestHandler.cs
    244. 

  244. --- giver-0.1.8/src/RequestHandler.cs.username_face	2007-08-03 01:19:01.000000000 -0400
    245. 

  245. +++ giver-0.1.8/src/RequestHandler.cs	2008-12-02 14:48:39.000000000 -0500
    246. 

  246. @@ -437,7 +437,8 @@ namespace Giver
    247. 

  247.  		private void HandlePhoto(HttpListenerContext context)
    248. 

  248.  		{
    249. 

  249.  			// get the information about what wants to be sent
    250. 

  250. -			if(Application.Preferences.PhotoType.CompareTo(Preferences.Local) != 0)
    251. 

  251. +			if(Application.Preferences.PhotoType.CompareTo(Preferences.Local) != 0 && 
    252. 

  252. +               Application.Preferences.PhotoType.CompareTo(Preferences.UserFace) != 0)
    253. 

  253.  			{
    254. 

  254.  				context.Response.StatusCode = (int)HttpStatusCode.NotFound;
    255. 

  255.  				context.Response.StatusDescription = Application.Preferences.PhotoLocation;
    256. 

  256. @@ -447,8 +448,12 @@ namespace Giver
    257. 

  257.  
    258. 

  258.  			try
    259. 

  259.  			{
    260. 

  260. +                string location = Application.Preferences.PhotoLocation;
    261. 

  261. +                if (Application.Preferences.PhotoType.CompareTo(Preferences.UserFace) == 0)
    262. 

  262. +                    location = Utilities.GetUserFacePath();
    263. 

  263. +                
    264. 

  264.  				FileStream fs = 
    265. 

  265. -					File.Open(Application.Preferences.PhotoLocation, FileMode.Open, FileAccess.Read);
    266. 

  266. +					File.Open(location, FileMode.Open, FileAccess.Read);
    267. 

  267.  				Stream stream = context.Response.OutputStream;
    268. 

  268.  				context.Response.ContentLength64 = fs.Length;
    269. 

  269.  				context.Response.StatusCode = (int)HttpStatusCode.OK;
    270. 

  270. diff -up giver-0.1.8/src/ServiceLocator.cs.username_face giver-0.1.8/src/ServiceLocator.cs
    271. 

  271. --- giver-0.1.8/src/ServiceLocator.cs.username_face	2007-08-03 01:19:17.000000000 -0400
    272. 

  272. +++ giver-0.1.8/src/ServiceLocator.cs	2008-12-02 14:50:58.000000000 -0500
    273. 

  273. @@ -271,6 +271,7 @@ namespace Giver {
    274. 

  274.  					
    275. 

  275.  					if(serviceInfo.PhotoType.CompareTo(Preferences.Local) == 0 ||
    276. 

  276.  						serviceInfo.PhotoType.CompareTo (Preferences.Gravatar) == 0 ||
    277. 

  277. +						serviceInfo.PhotoType.CompareTo(Preferences.UserFace) == 0 ||
    278. 

  278.  						serviceInfo.PhotoType.CompareTo (Preferences.Uri) == 0) {
    279. 

  279.  						// Queue the resolution of the photo
    280. 

  280.  						PhotoService.QueueResolve (serviceInfo);
    281. 

  281. diff -up giver-0.1.8/src/Utilities.cs.username_face giver-0.1.8/src/Utilities.cs
    282. 

  282. --- giver-0.1.8/src/Utilities.cs.username_face	2007-08-03 01:20:05.000000000 -0400
    283. 

  283. +++ giver-0.1.8/src/Utilities.cs	2008-12-02 14:48:39.000000000 -0500
    284. 

  284. @@ -32,6 +32,7 @@ using System.Text;
    285. 

  285.  using System.Net;
    286. 

  286.  using System.IO;
    287. 

  287.  using System.Security.Cryptography;
    288. 

  288. +using Mono.Unix;
    289. 

  289.  
    290. 

  290.  
    291. 

  291.  namespace Giver
    292. 

  292. @@ -254,5 +255,43 @@ namespace Giver
    293. 

  293.          }
    294. 

  294.  
    295. 

  295.  
    296. 

  296. +        public static Gdk.Pixbuf GetUserFaceIcon(int size)
    297. 

  297. +        {
    298. 

  298. +			try {
    299. 

  299. +				Gdk.Pixbuf ret = new Gdk.Pixbuf (Utilities.GetUserFacePath());
    300. 

  300. +				return ret.ScaleSimple (size, size, Gdk.InterpType.Bilinear);
    301. 

  301. +			} catch (ArgumentException) {}
    302. 

  302. +			
    303. 

  303. +			Logger.Debug ("Unable to load user face.");
    304. 

  304. +			return null;
    305. 

  305. +        }
    306. 

  306. +        
    307. 

  307. +        public static bool UserFaceExists()
    308. 

  308. +        {
    309. 

  309. +            return File.Exists(Utilities.GetUserFacePath());
    310. 

  310. +        }
    311. 

  311. +        
    312. 

  312. +        public static string GetUserFacePath()
    313. 

  313. +        {
    314. 

  314. +            /*
    315. 

  315. +                TODO this can be extended to also check for user faces at /opt/gnome/share/pixmaps/faces
    316. 

  316. +                     or whatever face file/directories supported by other login managers
    317. 

  317. +             */
    318. 

  318. +            return Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Personal),".face");
    319. 

  319. +        }
    320. 

  320. +        
    321. 

  321. +        public static string GetUserName()
    322. 

  322. +        {
    323. 

  323. +            UnixUserInfo user = UnixUserInfo.GetRealUser();
    324. 

  324. +            string username = null;
    325. 

  325. +            if ( user.RealName != null && user.RealName.Length > 0)
    326. 

  326. +                username = user.RealName.Split(new char[]{','})[0];
    327. 

  327. +            
    328. 

  328. +            if ( username == null || username == "")
    329. 

  329. +                username = Environment.UserName;
    330. 

  330. +            
    331. 

  331. +            return username;
    332. 

  332. +        }
    333. 

  333. +        
    334. 

  334.  	}
    335. 

  335.  }
    336. 

  336.