Merge lp:~robru/libfriends/deprecate into lp:libfriends

[Robert Bruce Park]

So, I identified and fixed a bunch of warnings, but this is really just the start: the testsuite has been determined to be effectively tautological, so that needs to get fixed, and also I likely broke a bunch of other stuff too. Watch out for the FIXMEs ;-)

[lp:~robru/libfriends/deprecate]

50. By Robert Bruce Park on 2013-01-12

Fix comments.

=== modified file 'gtk/account.vala'
--- gtk/account.vala	2013-01-11 17:25:44 +0000
+++ gtk/account.vala	2013-01-12 02:18:21 +0000
@@ -82,8 +82,15 @@
             }
             set {
               GLib.Value t = value;
-              _account.set_value("friends/color", t);
-              _account.store_blocking();
+              try
+              {
+                  _account.set_value("friends/color", t);
+                  _account.store_blocking();
+              }
+              catch (Ag.AccountsError e)
+              {
+                  warning (e.message);
+              }
             }
         }
 
@@ -117,8 +124,15 @@
               GLib.Value t = false;
               if (value == "1")
                 t = true;
-              _account.set_value("friends/send_enabled", t);
-              _account.store_blocking();
+              try
+              {
+                  _account.set_value("friends/send_enabled", t);
+                  _account.store_blocking();
+              }
+              catch (Ag.AccountsError e)
+              {
+                  warning (e.message);
+              }
             }
         }
 

=== modified file 'gtk/entry.vala'
--- gtk/entry.vala	2013-01-11 17:25:44 +0000
+++ gtk/entry.vala	2013-01-12 02:18:21 +0000
@@ -124,14 +124,14 @@
         private Friends.Service service;
 
         /**
-         * The {@link Gdk.Color} for the foreground
+         * The {@link Gdk.RGBA} for the foreground
          */
-        public Gdk.Color fg_color;
+        public Gdk.RGBA fg_color;
 
         /**
-         * The {@link Gdk.Color} for the error state
+         * The {@link Gdk.RGBA} for the error state
          */
-        public Gdk.Color error_color;
+        public Gdk.RGBA error_color;
 
         bool last_was_shortened = false;
         private string _mid = null;
@@ -159,9 +159,13 @@
             Gtk.BindingEntry.add_signal (binding_set, Gdk.keyval_from_name ("Return"), 0, "submit", 0);
             Gtk.BindingEntry.add_signal (binding_set, Gdk.keyval_from_name ("KP_Enter"), 0, "submit", 0);
             Gtk.BindingEntry.add_signal (binding_set, Gdk.keyval_from_name ("Escape"), 0, "clear", 0);
-            fg_color = get_style ().text[Gtk.StateType.NORMAL];
-
-            Gdk.Color.parse ("indianred", out error_color);
+
+            // FIXME: How do we tell this StyleContext to get the color from the right place?
+            Gtk.StyleContext context = new Gtk.StyleContext ();
+            fg_color = context.get_color (Gtk.StateFlags.NORMAL);
+
+            error_color = Gdk.RGBA ();
+            error_color.parse("indianred");
 
             get_buffer ().changed.connect (on_text_changed);
             get_buffer ().insert_text.connect (on_text_inserted);
@@ -245,8 +249,10 @@
         private void on_text_changed ()
         {
             var chars = get_buffer ().get_char_count ();
-            modify_fg (Gtk.StateType.NORMAL,
-                        chars > MAX_MESSAGE_LENGTH ? error_color : fg_color);
+            override_color (
+                Gtk.StateFlags.NORMAL,
+                chars > MAX_MESSAGE_LENGTH ? error_color : fg_color
+                );
         }
 
         private void on_text_inserted (ref Gtk.TextIter iter, string text, int len)
@@ -300,9 +306,9 @@
             {
                 context.translate(-1, -1);
                 factor = 1.0;
-            } else if (get_state () == 2) {
+            } else if (get_state_flags () == Gtk.StateFlags.PRELIGHT) {
                 factor = 0.3;
-            } else if (get_state () == 1) {
+            } else if (get_state_flags () == Gtk.StateFlags.ACTIVE) {
                 factor = 0.5;
             }
 
@@ -354,10 +360,10 @@
         {
             Object (spacing:0);
         }
- 
+
         /*
          * The {@Ag.Account.id} of the account button to be displayed
-         * This is used in the case of replies or private messages 
+         * This is used in the case of replies or private messages
          * where the post will only go to a single account
          */
         public uint? selected {
@@ -490,7 +496,7 @@
             return account_button;
         }
 
-        /* 
+        /*
          * Set the number of remaining characters allowed to post
          * @param chars Number of characters remaining
          */

=== modified file 'src/service.vala'
--- src/service.vala	2013-01-11 18:53:44 +0000
+++ src/service.vala	2013-01-12 02:18:21 +0000
@@ -236,12 +236,7 @@
          */
         public bool retweet(uint account_id, string message_id)
         {
-            try {
-                return do("retweet", account_id.to_string(), message_id);
-            } catch (GLib.Error e) {
-                warning (e.message);
-            }
-            return false;
+            return do("retweet", account_id.to_string(), message_id);
         }
 
         /**
@@ -257,12 +252,7 @@
          */
         public bool home(uint account_id)
         {
-            try {
-                return do("home", account_id.to_string(), "");
-            } catch (GLib.Error e) {
-                warning (e.message);
-            }
-            return false;
+            return do("home", account_id.to_string(), "");
         }
 
         /**
@@ -279,12 +269,7 @@
          */
         public bool wall(uint account_id)
         {
-            try {
-                return do("wall", account_id.to_string(), "");
-            } catch (GLib.Error e) {
-                warning (e.message);
-            }
-            return false;
+            return do("wall", account_id.to_string(), "");
         }
 
         /**
@@ -299,15 +284,10 @@
          */
         public bool search(uint? account_id, string query)
         {
-            try {
-                if (account_id != null)
-                    return do("search", account_id.to_string(), query);
-                else
-                    return do("search", "", query);
-            } catch (GLib.Error e) {
-                warning (e.message);
-            }
-            return false;
+            if (account_id != null)
+                return do("search", account_id.to_string(), query);
+            else
+                return do("search", "", query);
         }
 
         /**
@@ -322,12 +302,7 @@
          */
         public bool like(uint account_id, string message_id)
         {
-            try {
-                return do("like", account_id.to_string(), message_id);
-            } catch (GLib.Error e) {
-                warning (e.message);
-            }
-            return false;
+            return do("like", account_id.to_string(), message_id);
         }
 
         /**
@@ -342,12 +317,7 @@
          */
         public bool unlike(uint account_id, string message_id)
         {
-            try {
-                return do("unlike", account_id.to_string(), message_id);
-            } catch (GLib.Error e) {
-                warning (e.message);
-            }
-            return false;
+            return do("unlike", account_id.to_string(), message_id);
         }
 
         /**
@@ -362,12 +332,7 @@
          */
         public bool delete(uint account_id, string message_id)
         {
-            try {
-                return do("delete", account_id.to_string(), message_id);
-            } catch (GLib.Error e) {
-                warning (e.message);
-            }
-            return false;
+            return do("delete", account_id.to_string(), message_id);
         }
 
         /**
@@ -381,12 +346,7 @@
          */
         public bool contacts(uint account_id)
         {
-            try {
-                return do("contacts", account_id.to_string(), "");
-            } catch (GLib.Error e) {
-                warning (e.message);
-            }
-            return false;
+            return do("contacts", account_id.to_string(), "");
         }
 
         /**
@@ -413,8 +373,8 @@
         /**
          * This method returns a list of all the possible actions
          * supported by a given protocol. This can be used to
-         * determine what actions are available for the requested 
-         * protocol.  
+         * determine what actions are available for the requested
+         * protocol.
          *
          * @param protocol One of ``facebook``, ``flickr``,
          * ``foursquare``, ``identica``, or ``twitter``.

=== modified file 'src/utils.vala'
--- src/utils.vala	2013-01-09 18:50:08 +0000
+++ src/utils.vala	2013-01-12 02:18:21 +0000
@@ -54,7 +54,6 @@
         {
             string _avatar_cache_image = Path.build_path (Path.DIR_SEPARATOR_S, Environment.get_user_cache_dir(), "friends/avatars", GLib.Checksum.compute_for_string (GLib.ChecksumType.SHA1, url));
             debug ("AVATAR PATH: %s", _avatar_cache_image);
-            var file = File.new_for_path (_avatar_cache_image);
             return _avatar_cache_image;
         }
     }

=== modified file 'tests/vala/test-service.vala'
--- tests/vala/test-service.vala	2013-01-09 19:41:41 +0000
+++ tests/vala/test-service.vala	2013-01-12 02:18:21 +0000
@@ -63,50 +63,37 @@
 
         internal static void test_refresh ()
         {
+            // https://bugs.launchpad.net/libfriends/+bug/1098773
+            // FIXME: Need to capture STDOUT and ensure correct DBus
+            // call is present.
             var service = new Friends.Service ();
             bool success = false;
-            try
-            {
-                service.refresh ();
-                success = true;
-            }
-            catch (GLib.IOError e)
-            {
-                warning ("Failed to refresh - %s", e.message);
-            }
+            service.refresh ();
+            success = true;
             assert (success == true);
-
         }
 
         internal static void test_quit ()
         {
+            // https://bugs.launchpad.net/libfriends/+bug/1098773
+            // FIXME: Need to capture STDOUT and ensure correct DBus
+            // call is present.
             var service = new Friends.Service ();
             bool success = false;
-            try
-            {
-                service.quit ();
-                success = true;
-            }
-            catch (GLib.IOError e)
-            {
-                warning ("Failed to shutdown - %s", e.message);
-            }
+            service.quit ();
+            success = true;
             assert (success == true);
 
         }
 
         internal static void test_features ()
         {
+            // https://bugs.launchpad.net/libfriends/+bug/1098773
+            // FIXME: Need to capture STDOUT and ensure correct DBus
+            // call is present.
             var service = new Friends.Service ();
             string[] features;
-            try
-            {
-                features = service.features ("twitter");
-            }
-            catch (GLib.IOError e)
-            {
-                warning ("Failed to get features - %s", e.message);
-            }
+            features = service.features ("twitter");
             assert ("send" in features);
         }
 
@@ -129,87 +116,67 @@
 
         internal static void test_send_message ()
         {
+            // https://bugs.launchpad.net/libfriends/+bug/1098773
+            // FIXME: Need to capture STDOUT and ensure correct DBus
+            // call is present.
             var service = new Friends.Service ();
             uint? acct = null;
             string msg = "A message";
             bool success = false;
-            try
-            {
-                service.send_message (acct, msg);
-                success = true;
-            }
-            catch (GLib.IOError e)
-            {
-                warning ("Failed to SendMessage - %s", e.message);
-            }
+            service.send_message (acct, msg);
+            success = true;
             assert (success == true);
         }
 
         internal static void test_send_message_with_account ()
         {
+            // https://bugs.launchpad.net/libfriends/+bug/1098773
+            // FIXME: Need to capture STDOUT and ensure correct DBus
+            // call is present.
             var service = new Friends.Service ();
             uint acct = 1;
             string msg = "A message";
             bool success = false;
-            try
-            {
-                service.send_message (acct, msg);
-                success = true;
-            }
-            catch (GLib.IOError e)
-            {
-                warning ("Failed to SendMessage - %s", e.message);
-            }
+            service.send_message (acct, msg);
+            success = true;
             assert (success == true);
         }
 
         internal static void test_send_reply ()
         {
+            // https://bugs.launchpad.net/libfriends/+bug/1098773
+            // FIXME: Need to capture STDOUT and ensure correct DBus
+            // call is present.
             var service = new Friends.Service ();
             uint acct = 1;
             string msg = "A message";
             string msg_id = "100";
             bool success = false;
-            try
-            {
-                service.send_reply (acct, msg_id, msg);
-                success = true;
-            }
-            catch (GLib.IOError e)
-            {
-                warning ("Failed to SendReply - %s", e.message);
-            }
+            service.send_reply (acct, msg_id, msg);
+            success = true;
             assert (success == true);
         }
 
         internal static void test_clear_indicators ()
         {
+            // https://bugs.launchpad.net/libfriends/+bug/1098773
+            // FIXME: Need to capture STDOUT and ensure correct DBus
+            // call is present.
             var service = new Friends.Service ();
             bool success = false;
-            try
-            {
-                service.messaging_menu_clear ();
-                success = true;
-            }
-            catch (GLib.IOError e)
-            {
-                warning ("Failed to clear indicators - %s", e.message);
-            }
+            service.messaging_menu_clear ();
+            success = true;
             assert (success == true);
         }
 
         internal static void test_url_shorten ()
         {
+            // https://bugs.launchpad.net/libfriends/+bug/1098773
+            // FIXME: Need to capture STDOUT and ensure correct DBus
+            // call is present.
             var service = new Friends.Service ();
             string result = "";
-            try
-            {
-                result = service.shorten ("http://example.com/really/really/long");
-            }
-            catch (GLib.IOError e)
-            {
-                warning ("Failed to shorten URL - %s", e.message);
-            }
+            result = service.shorten ("http://example.com/really/really/long");
             assert (result == "http://is.gd/short");
         }
     }