pino/pino.patch

   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
   4 @@ -24,7 +24,7 @@
   5  using Auth;
   6  using RestAPI;
   7
   8 -public class AccountAction : Action {
   9 +public class AccountAction : Gtk.Action {
  10
  11         private Accounts accounts;
  12         private MenuItem menu_item;
  13 @@ -35,10 +35,10 @@
  14         private RestAPIAcc api;
  15         private Cache cache;
  16
  17 -       weak Thread thread_1;
  18 +       weak Thread<bool> thread_1;
  19
  20         public AccountAction() {
  21 -               name = "AccountAct";
  22 +               GLib.Object (name: "AccountAct");
  23                 label = _("Accounts");
  24                 tooltip = null;
  25                 stock_id = null;
  26 @@ -118,27 +118,27 @@
  27                 }
  28
  29                 try {
  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);
  34                         return;
  35          }
  36         }
  37
  38 -       private void *get_userpic() {
  39 +       private bool get_userpic() {
  40                 string? url = null;
  41
  42                 try {
  43                         url = api.get_userpic_url();
  44                 } catch(RestError e) {
  45 -                       return null;
  46 +                       return false;
  47                 } catch(ParseError e) {
  48 -                       return null;
  49 +                       return false;
  50                 }
  51
  52                 if(url == null) {
  53                         set_gicon(default_icon);
  54 -                       return null;
  55 +                       return true;
  56                 }
  57
  58                 string path = cache.get_or_download(url, Cache.Method.SYNC, true);
  59 @@ -146,6 +146,6 @@
  60                 Icon icon = Icon.new_for_string(path);
  61                 set_gicon(icon);
  62
  63 -               return null;
  64 +               return true;
  65         }
  66  }
  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
  70 @@ -41,8 +41,8 @@
  71                 fg_color = rgb_to_hex(style.fg[Gtk.StateType.NORMAL]);
  72                 sl_color = rgb_to_hex(style.bg[Gtk.StateType.SELECTED]);
  73
  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);
  79
  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
  84 @@ -34,7 +34,7 @@
  85
  86         unowned SList<RadioAction> list_group;
  87
  88 -       private Action updateAct;
  89 +       private Gtk.Action updateAct;
  90         private ToggleAction menuAct;
  91         private ToggleAction toolbarAct;
  92         private AccountAction accountAct;
  93 @@ -446,53 +446,53 @@
  94         }
  95
  96         private void menu_init() {
  97 -               var actGroup = new ActionGroup("main");
  98 +               var actGroup = new Gtk.ActionGroup("main");
  99
 100                 //file menu
 101 -               var fileMenu = new Action("FileMenu", "Pino", null, null);
 102 +               var fileMenu = new Gtk.Action("FileMenu", "Pino", null, null);
 103
 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(); });
 108
 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("");
 115                 });
 116
 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();
 123                 });
 124
 125 -               var showFavoritesAct = new Action("ShowFavorites", _("Show favorites..."),
 126 +               var showFavoritesAct = new Gtk.Action("ShowFavorites", _("Show favorites..."),
 127                         null, null);
 128                 showFavoritesAct.set_gicon(Icon.new_for_string(Config.FAVORITE_PATH));
 129                 showFavoritesAct.activate.connect(() => {
 130                         new FavoritesViewDialog(this, accounts, template);
 131                 });
 132
 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"),
 139                         null, STOCK_QUIT);
 140                 quitAct.activate.connect(before_close);
 141
 142                 //edit menu
 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);
 151
 152                 //view menu
 153 -               var viewMenu = new Action("ViewMenu", _("View"), null, null);
 154 +               var viewMenu = new Gtk.Action("ViewMenu", _("View"), null, null);
 155
 156                 menuAct = new ToggleAction("ViewMenuAct", _("Show menu"), null, null);
 157                 menuAct.set_active(true);
 158 @@ -516,8 +516,8 @@
 159                 });
 160
 161                 //help menu
 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),
 166                         null, STOCK_ABOUT);
 167
 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
 172 @@ -28,7 +28,7 @@
 173         public signal void moar_event();
 174
 175         public MoreWindow() {
 176 -               type = WindowType.POPUP;
 177 +               GLib.Object (type: WindowType.POPUP);
 178
 179                 //set_position(WindowPosition.MOUSE);
 180
 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
 184 @@ -76,7 +76,7 @@
 185                         head = "%s %s %s".printf(_("Direct message"), _("from"), head);
 186
 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);
 190
 191                 string av_path = cache.get_or_download(status.user_avatar,
 192                         Cache.Method.ASYNC, false);
 193 @@ -92,7 +92,7 @@
 194
 195         private void show_short_popup(string text) {
 196                 Notification popup = new Notification(_("Updates"),
 197 -                       text, null, null);
 198 +                       text, null);
 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
 205 @@ -76,12 +76,12 @@
 206         UNKNOWN
 207  }
 208
 209 -errordomain RestError {
 210 +public errordomain RestError {
 211         CODE,
 212         CODE_404
 213  }
 214
 215 -errordomain ParseError {
 216 +public errordomain ParseError {
 217         CODE
 218  }
 219
 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
 223 @@ -52,7 +52,7 @@
 224         private Label label;
 225         public Label user_label;
 226
 227 -       public Action shortAct;
 228 +       public Gtk.Action shortAct;
 229
 230         private DmEntry direct_entry;
 231         private ToolButton close_btn;
 232 @@ -85,7 +85,7 @@
 233
 234                 url_short = new UrlShort(prefs, api);
 235
 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
 244 @@ -36,7 +36,7 @@
 245                 need_more_button = false; //no "more" button
 246         }
 247
 248 -       private override void get_older(){}
 249 +       protected override void get_older(){}
 250
 251         public override ArrayList<Status>? update() {
 252                 refresh();
 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
 256 @@ -23,7 +23,7 @@
 257
 258  public class Userpic : Image {
 259
 260 -       private weak Thread thread_1;
 261 +       private weak Thread<bool> thread_1;
 262         private string url;
 263         private Cache cache;
 264
 265 @@ -46,18 +46,18 @@
 266                 url = _url;
 267
 268                 try {
 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);
 273                         return;
 274                 }
 275         }
 276
 277 -       private void *get_userpic() {
 278 +       private bool get_userpic() {
 279                 string path = cache.get_or_download(url, Cache.Method.SYNC, true);
 280
 281                 set_from_file(path);
 282
 283 -               return null;
 284 +               return true;
 285         }
 286  }
 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
 290 @@ -2,7 +2,7 @@
 291
 292  import intltool
 293
 294 -VERSION = "0.2.10"
 295 +VERSION = "0.2.11"
 296  VERSION_MAJOR_MINOR =  ".".join(VERSION.split(".")[0:2])
 297  APPNAME = "pino"
 298