Do Plugins

Merge lp://qastaging/~cszikszoy/do-plugins/piding-fix into lp://qastaging/do-plugins

  1. piding-fix
  2. Merge into trunk
Proposed by Chris S.
Status: Merged
Merged at revision: not available
Proposed branch: lp://qastaging/~cszikszoy/do-plugins/piding-fix
Merge into: lp://qastaging/do-plugins
Diff against target: None lines
To merge this branch: bzr merge lp://qastaging/~cszikszoy/do-plugins/piding-fix
Reviewer Review Type Date Requested Status
Do Plugins Team Pending
Review via email: mp+4049@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
Alex Launi (alexlauni) :

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Pidgin/src/Pidgin.cs'
2--- Pidgin/src/Pidgin.cs 2009-02-28 21:46:29 +0000
3+++ Pidgin/src/Pidgin.cs 2009-03-01 20:28:07 +0000
4@@ -47,8 +47,8 @@
5 int PurpleFindBuddy (int account, string name);
6 void PurpleConversationPresent (int conversation);
7 int PurpleAccountsFindConnected (string account, string proto);
8- int PurpleConversationNew (uint type, int account, string name);
9- int PurpleSavedstatusNew (string title, uint type);
10+ int PurpleConversationNew (int type, int account, string name);
11+ int PurpleSavedstatusNew (string title, int type);
12 void PurpleSavedstatusSetMessage (int type, string message);
13 void PurpleSavedstatusActivate (int status);
14 int [] PurpleSavedstatusesGetAll ();
15@@ -60,8 +60,16 @@
16 int PurpleSavedstatusFind (string title);
17 string PurpleAccountGetProtocolName (int account);
18 string PurpleAccountGetAlias (int account);
19+ void PurpleAccountSetEnabled (int account, string ui, int value);
20+ string PurpleAccountGetUsername (int account);
21+
22+ #region Pidgin < 2.5.4 compatibility methods
23+
24+ int PurpleConversationNew (uint type, int account, string name);
25+ int PurpleSavedstatusNew (string title, uint type);
26 void PurpleAccountSetEnabled (int account, string ui, uint value);
27- string PurpleAccountGetUsername (int account);
28+
29+ #endregion
30 }
31
32 public static string ChatIcon {
33@@ -147,7 +155,12 @@
34 prpl = GetPurpleObject ();
35 int status;
36 try {
37- status = prpl.PurpleSavedstatusNew ("", kind);
38+ try {
39+ status = prpl.PurpleSavedstatusNew ("", (int) kind);
40+ }
41+ catch {
42+ status = prpl.PurpleSavedstatusNew ("", (uint) kind);
43+ }
44 prpl.PurpleSavedstatusSetMessage (status, message);
45 prpl.PurpleSavedstatusActivate (status);
46 } catch {
47@@ -164,7 +177,12 @@
48 GetBuddyIsOnlineAndAccount (name, out account);
49 if (account == -1)
50 account = prpl.PurpleAccountsFindConnected ("", "");
51- conversation = prpl.PurpleConversationNew (1, account, name);
52+ try {
53+ conversation = prpl.PurpleConversationNew ((int) 1, account, name);
54+ }
55+ catch {
56+ conversation = prpl.PurpleConversationNew ((uint) 1, account, name);
57+ }
58 prpl.PurpleConversationPresent (conversation);
59 } catch (Exception e) {
60 Log<Pidgin>.Error ("Could not create new Pidgin conversation: {0}", e.Message);
61
62=== modified file 'Pidgin/src/PidginAccountActions.cs'
63--- Pidgin/src/PidginAccountActions.cs 2009-01-15 22:39:03 +0000
64+++ Pidgin/src/PidginAccountActions.cs 2009-03-01 20:28:07 +0000
65@@ -65,8 +65,14 @@
66 Pidgin.IPurpleObject prpl;
67 try {
68 prpl = Pidgin.GetPurpleObject ();
69- prpl.PurpleAccountSetEnabled ((items.First () as PidginAccountItem).Id,
70- "gtk-gaim", 1);
71+ try {
72+ prpl.PurpleAccountSetEnabled ((items.First () as PidginAccountItem).Id,
73+ "gtk-gaim", (int) 1);
74+ }
75+ catch {
76+ prpl.PurpleAccountSetEnabled ((items.First () as PidginAccountItem).Id,
77+ "gtk-gaim", (uint) 1);
78+ }
79 } catch (Exception e) {
80 Log<PidginEnableAccount>.Error ("Could not disable Pidgin account: {0}", e.Message);
81 Log<PidginEnableAccount>.Debug (e.StackTrace);

Subscribers

People subscribed via source and target branches