1 diff -ur pino-0.2.10.orig/src/account_action.vala pino-0.2.10/src/account_action.vala
2 --- pino-0.2.10.orig/src/account_action.vala 2010-05-14 12:38:02.000000000 +0200
3 +++ pino-0.2.10/src/account_action.vala 2011-05-21 23:45:53.000000000 +0200
8 -public class AccountAction : Action {
9 +public class AccountAction : Gtk.Action {
11 private Accounts accounts;
12 private MenuItem menu_item;
14 private RestAPIAcc api;
17 - weak Thread thread_1;
18 + weak Thread<bool> thread_1;
20 public AccountAction() {
21 - name = "AccountAct";
22 + GLib.Object (name: "AccountAct");
23 label = _("Accounts");
30 - thread_1 = Thread.create(get_userpic, false);
31 + thread_1 = Thread.create<bool> (get_userpic, false);
32 } catch(ThreadError e) {
33 warning("Error: %s", e.message);
38 - private void *get_userpic() {
39 + private bool get_userpic() {
43 url = api.get_userpic_url();
44 } catch(RestError e) {
47 } catch(ParseError e) {
53 set_gicon(default_icon);
58 string path = cache.get_or_download(url, Cache.Method.SYNC, true);
60 Icon icon = Icon.new_for_string(path);
67 diff -ur pino-0.2.10.orig/src/gtk_style.vala pino-0.2.10/src/gtk_style.vala
68 --- pino-0.2.10.orig/src/gtk_style.vala 2010-05-14 12:38:02.000000000 +0200
69 +++ pino-0.2.10/src/gtk_style.vala 2011-05-21 01:44:35.000000000 +0200
71 fg_color = rgb_to_hex(style.fg[Gtk.StateType.NORMAL]);
72 sl_color = rgb_to_hex(style.bg[Gtk.StateType.SELECTED]);
74 - Value v = new Value(typeof(Gdk.Color));// = null;
75 - style.get_style_property(typeof(Gtk.Widget), "link-color", v);
76 + Value v = Value(typeof(Gdk.Color));// = null;
77 + style.get_style_property(typeof(Gtk.Widget), "link-color", out v);
78 lk_color = rgb_to_hex((Gdk.Color) v);
80 //working on light color (lt_color)
81 diff -ur pino-0.2.10.orig/src/main_window.vala pino-0.2.10/src/main_window.vala
82 --- pino-0.2.10.orig/src/main_window.vala 2010-05-26 12:14:36.000000000 +0200
83 +++ pino-0.2.10/src/main_window.vala 2011-05-21 00:58:48.000000000 +0200
86 unowned SList<RadioAction> list_group;
88 - private Action updateAct;
89 + private Gtk.Action updateAct;
90 private ToggleAction menuAct;
91 private ToggleAction toolbarAct;
92 private AccountAction accountAct;
96 private void menu_init() {
97 - var actGroup = new ActionGroup("main");
98 + var actGroup = new Gtk.ActionGroup("main");
101 - var fileMenu = new Action("FileMenu", "Pino", null, null);
102 + var fileMenu = new Gtk.Action("FileMenu", "Pino", null, null);
104 - var createAct = new Action("FileCreate", _("New status"),
105 + var createAct = new Gtk.Action("FileCreate", _("New status"),
106 _("Create new status"), STOCK_EDIT);
107 createAct.activate.connect(() => { re_tweet.set_state_new(); });
109 - var createDirectAct = new Action("FileCreateDirect", _("New direct message"),
110 + var createDirectAct = new Gtk.Action("FileCreateDirect", _("New direct message"),
111 _("Create new direct message"), null);
112 createDirectAct.set_gicon(Icon.new_for_string(Config.DIRECT_REPLY_PATH));
113 createDirectAct.activate.connect(() => {
114 re_tweet.set_state_directreply("");
117 - var showUserAct = new Action("ShowUser", _("Show user"),
118 + var showUserAct = new Gtk.Action("ShowUser", _("Show user"),
119 _("Show information about specified user"), null);
120 showUserAct.activate.connect(() => {
121 user_info.set_empty();
122 user_info.act.activate();
125 - var showFavoritesAct = new Action("ShowFavorites", _("Show favorites..."),
126 + var showFavoritesAct = new Gtk.Action("ShowFavorites", _("Show favorites..."),
128 showFavoritesAct.set_gicon(Icon.new_for_string(Config.FAVORITE_PATH));
129 showFavoritesAct.activate.connect(() => {
130 new FavoritesViewDialog(this, accounts, template);
133 - updateAct = new Action("FileUpdate", _("Update timeline"),
134 + updateAct = new Gtk.Action("FileUpdate", _("Update timeline"),
135 null, STOCK_REFRESH);
136 updateAct.activate.connect(refresh_action);
137 - var quitAct = new Action("FileQuit", _("Quit"),
138 + var quitAct = new Gtk.Action("FileQuit", _("Quit"),
140 quitAct.activate.connect(before_close);
143 - var editMenu = new Action("EditMenu", _("Edit"), null, null);
144 + var editMenu = new Gtk.Action("EditMenu", _("Edit"), null, null);
145 accountAct = new AccountAction();
146 accountAct.set_accounts(accounts);
147 - var prefAct = new Action("EditPref", _("Preferences"),
148 + var prefAct = new Gtk.Action("EditPref", _("Preferences"),
149 null, STOCK_PREFERENCES);
150 prefAct.activate.connect(run_prefs);
153 - var viewMenu = new Action("ViewMenu", _("View"), null, null);
154 + var viewMenu = new Gtk.Action("ViewMenu", _("View"), null, null);
156 menuAct = new ToggleAction("ViewMenuAct", _("Show menu"), null, null);
157 menuAct.set_active(true);
162 - var helpMenu = new Action("HelpMenu", _("Help"), null, null);
163 - var aboutAct = new Action("HelpAbout", _("About %s").printf(Config.APPNAME),
164 + var helpMenu = new Gtk.Action("HelpMenu", _("Help"), null, null);
165 + var aboutAct = new Gtk.Action("HelpAbout", _("About %s").printf(Config.APPNAME),
168 aboutAct.activate.connect(() => {
169 diff -ur pino-0.2.10.orig/src/more_window.vala pino-0.2.10/src/more_window.vala
170 --- pino-0.2.10.orig/src/more_window.vala 2010-05-14 12:38:02.000000000 +0200
171 +++ pino-0.2.10/src/more_window.vala 2011-05-21 01:45:24.000000000 +0200
173 public signal void moar_event();
175 public MoreWindow() {
176 - type = WindowType.POPUP;
177 + GLib.Object (type: WindowType.POPUP);
179 //set_position(WindowPosition.MOUSE);
181 diff -ur pino-0.2.10.orig/src/popups.vala pino-0.2.10/src/popups.vala
182 --- pino-0.2.10.orig/src/popups.vala 2010-05-14 12:38:02.000000000 +0200
183 +++ pino-0.2.10/src/popups.vala 2011-05-21 22:30:38.000000000 +0200
185 head = "%s %s %s".printf(_("Direct message"), _("from"), head);
187 Notification popup = new Notification(GLib.Markup.escape_text(head),
188 - GLib.Markup.escape_text(status.text), null, null);
189 + GLib.Markup.escape_text(status.text), null);
191 string av_path = cache.get_or_download(status.user_avatar,
192 Cache.Method.ASYNC, false);
195 private void show_short_popup(string text) {
196 Notification popup = new Notification(_("Updates"),
199 popup.set_icon_from_pixbuf(logo);
200 popup.set_timeout(5000);
201 popup.set_urgency(Notify.Urgency.NORMAL);
202 diff -ur pino-0.2.10.orig/src/rest_api_abstract.vala pino-0.2.10/src/rest_api_abstract.vala
203 --- pino-0.2.10.orig/src/rest_api_abstract.vala 2010-05-26 12:12:05.000000000 +0200
204 +++ pino-0.2.10/src/rest_api_abstract.vala 2011-05-21 01:40:28.000000000 +0200
209 -errordomain RestError {
210 +public errordomain RestError {
215 -errordomain ParseError {
216 +public errordomain ParseError {
220 diff -ur pino-0.2.10.orig/src/re_tweet.vala pino-0.2.10/src/re_tweet.vala
221 --- pino-0.2.10.orig/src/re_tweet.vala 2010-05-14 13:09:20.000000000 +0200
222 +++ pino-0.2.10/src/re_tweet.vala 2011-05-21 01:47:23.000000000 +0200
225 public Label user_label;
227 - public Action shortAct;
228 + public Gtk.Action shortAct;
230 private DmEntry direct_entry;
231 private ToolButton close_btn;
234 url_short = new UrlShort(prefs, api);
236 - shortAct = new Action("UrlShort", _("Shorten URLs..."), null, null);
237 + shortAct = new Gtk.Action("UrlShort", _("Shorten URLs..."), null, null);
238 shortAct.set_sensitive(false);
239 shortAct.activate.connect(() => {
240 shortAct.set_sensitive(false);
241 diff -ur pino-0.2.10.orig/src/status_view_list.vala pino-0.2.10/src/status_view_list.vala
242 --- pino-0.2.10.orig/src/status_view_list.vala 2010-05-14 12:38:02.000000000 +0200
243 +++ pino-0.2.10/src/status_view_list.vala 2011-05-22 00:07:08.000000000 +0200
245 need_more_button = false; //no "more" button
248 - private override void get_older(){}
249 + protected override void get_older(){}
251 public override ArrayList<Status>? update() {
253 diff -ur pino-0.2.10.orig/src/userpic.vala pino-0.2.10/src/userpic.vala
254 --- pino-0.2.10.orig/src/userpic.vala 2010-05-14 12:38:02.000000000 +0200
255 +++ pino-0.2.10/src/userpic.vala 2011-05-21 23:49:03.000000000 +0200
258 public class Userpic : Image {
260 - private weak Thread thread_1;
261 + private weak Thread<bool> thread_1;
269 - thread_1 = Thread.create(get_userpic, false);
270 + thread_1 = Thread.create<bool> (get_userpic, false);
271 } catch(ThreadError e) {
272 warning("Error: %s", e.message);
277 - private void *get_userpic() {
278 + private bool get_userpic() {
279 string path = cache.get_or_download(url, Cache.Method.SYNC, true);
287 diff -ur pino-0.2.10.orig/wscript pino-0.2.10/wscript
288 --- pino-0.2.10.orig/wscript 2010-05-26 12:23:51.000000000 +0200
289 +++ pino-0.2.10/wscript 2011-05-22 00:56:54.000000000 +0200
296 VERSION_MAJOR_MINOR = ".".join(VERSION.split(".")[0:2])