[Pkg-cli-apps-commits] r4011 - in /packages/galaxium/trunk/debian/patches: ./ 01-fix_Galaxium.AdiumThemes.dll.patch 02-fix_Galaxium.Startup.exe.patch series

[hanska-guest at users.alioth.debian.org]

Author: hanska-guest
Date: Thu Jun 19 15:35:42 2008
New Revision: 4011

URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=4011
Log:
First try of code cleanup -- will be submitted upstream

Added:
    packages/galaxium/trunk/debian/patches/
    packages/galaxium/trunk/debian/patches/01-fix_Galaxium.AdiumThemes.dll.patch
    packages/galaxium/trunk/debian/patches/02-fix_Galaxium.Startup.exe.patch
    packages/galaxium/trunk/debian/patches/series

Added: packages/galaxium/trunk/debian/patches/01-fix_Galaxium.AdiumThemes.dll.patch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/galaxium/trunk/debian/patches/01-fix_Galaxium.AdiumThemes.dll.patch?rev=4011&op=file
==============================================================================
--- packages/galaxium/trunk/debian/patches/01-fix_Galaxium.AdiumThemes.dll.patch (added)
+++ packages/galaxium/trunk/debian/patches/01-fix_Galaxium.AdiumThemes.dll.patch Thu Jun 19 15:35:42 2008
@@ -1,0 +1,27 @@
+--- galaxium-0.7.1.orig/src/Galaxium.Protocol.Msn/Abstract/AbstractChallenge.cs
++++ galaxium-0.7.1/src/Galaxium.Protocol.Msn/Abstract/AbstractChallenge.cs
+@@ -103,7 +103,7 @@
+ 			return (key);
+ 		}
+ 
+-		protected string CreateMD5HexString (string str)
++		protected static string CreateMD5HexString (string str)
+ 		{
+ 			MD5CryptoServiceProvider md5 = new MD5CryptoServiceProvider ();
+ 			byte[] hash = md5.ComputeHash (Encoding.UTF8.GetBytes (str));
+@@ -116,7 +116,7 @@
+ 			return sb.ToString ();
+ 		}
+ 
+-		protected string HexSwap (string str)
++		protected static string HexSwap (string str)
+ 		{
+ 			StringBuilder sb = new StringBuilder ();
+ 
+@@ -129,4 +129,4 @@
+ 			return (sb.ToString ());
+ 		}
+ 	}
+-}
+\ No newline at end of file
++}

Added: packages/galaxium/trunk/debian/patches/02-fix_Galaxium.Startup.exe.patch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/galaxium/trunk/debian/patches/02-fix_Galaxium.Startup.exe.patch?rev=4011&op=file
==============================================================================
--- packages/galaxium/trunk/debian/patches/02-fix_Galaxium.Startup.exe.patch (added)
+++ packages/galaxium/trunk/debian/patches/02-fix_Galaxium.Startup.exe.patch Thu Jun 19 15:35:42 2008
@@ -1,0 +1,55 @@
+--- galaxium-0.7.1.orig/src/Galaxium.Startup/GLibLogging.cs
++++ galaxium-0.7.1/src/Galaxium.Startup/GLibLogging.cs
+@@ -47,8 +47,8 @@
+ 		static void LogFunc (string logDomain, GLib.LogLevelFlags logLevel, string message)
+ 		{
+ 			System.Diagnostics.StackTrace trace = new System.Diagnostics.StackTrace (2, true);
+-			string msg = string.Format ("{0}-{1}: {2}\nStack trace: \n{3}", 
+-			    logDomain, logLevel, message, trace.ToString ());
++			string msg = string.Format ("{0}-{1}: {2}{3}Stack trace: {3}{4}",
++			    logDomain, logLevel, message, Environment.NewLine, trace.ToString ());
+ 			
+ 			switch (logLevel) {
+ 			case GLib.LogLevelFlags.Debug:
+@@ -103,4 +103,4 @@
+ 			Log.Error ("Unhandled exception in GLib event handler.", (Exception) args.ExceptionObject);
+ 		}
+ 	}
+-}
+\ No newline at end of file
++}
+--- galaxium-0.7.1.orig/src/Galaxium.Startup/Program.cs
++++ galaxium-0.7.1/src/Galaxium.Startup/Program.cs
+@@ -30,15 +30,15 @@
+ 
+ namespace Galaxium.Startup
+ {
+ 	public class Program
+ 	{
+-		public static void Main (string[] args)
++		internal static void Main (string[] args)
+ 		{
+ 			Console.WriteLine ("Galaxium Messenger");
+ 			Console.WriteLine ("Copyright (C) 2003-2008 Philippe Durand <draekz at gmail.com>");
+ 			Console.WriteLine ("Copyright (C) 2006-2008 Ben Motmans <ben.motmans at gmail.com>");
+ 			Console.WriteLine ("Copyright (C) 2007-2008 Paul Burton <paulburton89 at gmail.com>");
+-			Console.WriteLine ("");
++			Console.WriteLine (String.Empty);
+ 			
+ 			bool debug = true;
+ 			string appName = "Galaxium";
+@@ -67,6 +67,7 @@
+ 			catch (Exception e)
+ 			{
+ 				Log.Fatal (e, "Fatal exception while running Galaxium.");
++				throw;
+ 			}
+ 		}
+ 		
+@@ -81,4 +82,4 @@
+ 			AddinUtility.Initialize ();
+ 		}
+ 	}
+-}
+\ No newline at end of file
++}

Added: packages/galaxium/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/galaxium/trunk/debian/patches/series?rev=4011&op=file
==============================================================================
--- packages/galaxium/trunk/debian/patches/series (added)
+++ packages/galaxium/trunk/debian/patches/series Thu Jun 19 15:35:42 2008
@@ -1,0 +1,2 @@
+01-fix_Galaxium.AdiumThemes.dll.patch
+02-fix_Galaxium.Startup.exe.patch