Merge lp:~victored/granite/remove-outstanding-deprecations into lp:~elementary-pantheon/granite/granite

[Victor Martinez]

Remove outstanding deprecations from previous releases.

Remove outstanding deprecations from previous releases.

Please note that I am not removing Granite.Widgets.HintedEntry since oddly we deprecated it, but still based SearchEntry on it.

I did not remove the deprecated method from DynamicNotebook either since it's a widget with too many API clients.

Expect applications failing to build after landing this into trunk.

[lp:~victored/granite/remove-outstanding-deprecations]

606. By Victor Martinez on 2013-08-16

Bump version to 0.3.0, and SO version to 2

[Sergey "Shnatsel" Davidoff (shnatsel)]

why would you remove deprecated things? Deprecation warnings are a good idea, but breaking compilation for older code and third-party apps is not.

And soname bumps are generally painful, so I don't think deleting deprecated stuff justifies a soname bump.

review: Disapprove

[xapantu (xapantu)]

For now we are not going to merge it, it must be done the next time we are forced to do a SO bump (so we already lost an occasion to do it).

review: Abstain

Unmerged revisions

606. By Victor Martinez on 2013-08-16

Bump version to 0.3.0, and SO version to 2

605. By Victor Martinez on 2013-08-16

Remove outstanding deprecations from previous releases.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-08-16 22:52:50 +0000
+++ CMakeLists.txt	2013-08-16 23:42:02 +0000
@@ -5,7 +5,7 @@
 project (granite C)
 
 set (PKG_NAME ${CMAKE_PROJECT_NAME})
-set (PKG_VERSION 0.2.2)
+set (PKG_VERSION 0.3.0)
 set (API_VERSION 1.0)
 
 # Used to create GObject introspection files
 
=== modified file 'lib/Application.vala'
--- lib/Application.vala	2013-03-20 15:42:25 +0000
+++ lib/Application.vala	2013-08-16 23:42:02 +0000
@@ -23,13 +23,6 @@
 using Granite.Widgets;
 
 namespace Granite {
-
-    /**
-     * Global deprecated object..
-     */
-    [Deprecated (since = "granite-0.1")]
-    public static Granite.Application app;
-
     /**
      * This is the base class for all Granite-based apps. It has methods that help
      * to create a great deal of an app's functionality.
@@ -80,9 +73,6 @@
             Logger.DisplayLevel = LogLevel.WARN;
 
             Intl.bindtextdomain (exec_name, build_data_dir + "/locale");
-
-            // Deprecated
-            Granite.app = this;
         }
 
 #if LINUX
 
=== modified file 'lib/CMakeLists.txt'
--- lib/CMakeLists.txt	2013-06-08 20:38:28 +0000
+++ lib/CMakeLists.txt	2013-08-16 23:42:02 +0000
@@ -1,5 +1,5 @@
 # increase when you break the API
-set (PKG_SOVERSION 1)
+set (PKG_SOVERSION 2)
 
 # Increase when you add functionality
 set (PKG_SOMINOR 0.1)
@@ -15,7 +15,6 @@
     Services/Logger.vala
     Services/Paths.vala
     Services/System.vala
-    Services/Contractor.vala
     Services/ContractorProxy.vala
     Services/IconFactory.vala
     Services/SimpleCommand.vala
@@ -34,12 +33,9 @@
     Widgets/Welcome.vala
     Widgets/ToolButtonWithMenu.vala
     Widgets/PopOver.vala
-    Widgets/ContractorView.vala
-    Widgets/ContractorMenu.vala
     Widgets/DecoratedWindow.vala
     Widgets/LightWindow.vala
     Widgets/StatusBar.vala
-    Widgets/SidebarPaned.vala
     Widgets/SourceList.vala
     Widgets/CellRendererExpander.vala
     Widgets/CellRendererBadge.vala
 
=== removed file 'lib/Services/Contractor.vala'
--- lib/Services/Contractor.vala	2013-04-23 04:40:58 +0000
+++ lib/Services/Contractor.vala	1970-01-01 00:00:00 +0000
@@ -1,67 +0,0 @@
-/***
-    Copyright (C) 2011-2013 Lucas Baudin <[e-mail]>
-
-    This program or library is free software; you can redistribute it
-    and/or modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 3 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-    Lesser General Public License for more details.
- 
-    You should have received a copy of the GNU Lesser General
-    Public License along with this library; if not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301 USA.
-***/
-
-namespace Granite.Services {
-    [DBus (name = "org.elementary.Contractor")]
-    interface ContractorDBus : Object {
-        public abstract GLib.HashTable<string,string>[] GetServicesByLocation (string strlocation, string? file_mime = "") throws IOError;
-        public abstract GLib.HashTable<string,string>[] GetServicesByLocationsList (GLib.HashTable<string,string>[] locations) throws IOError;
-    }
-
-    /**
-     * A way to handle contractor, a way to communicate between apps.
-     * 
-     * /!\ Highly unstable API
-     */
-    [Deprecated (replacement = "Granite.Services.ContractorProxy", since = "0.2")]
-    public class Contractor : Object {
-        internal ContractorDBus contract;
-        internal static Contractor? contractor = null;
-
-        /**
-         * This creates a new Contractor 
-         */
-        public Contractor () {
-        }
-
-        internal static void ensure () {
-        }
-
-        /**
-         * This searches for available contracts of a particular file
-         *
-         * @param uri uri of file
-         * @param mime mime type of file
-         * @return Hashtable of available contracts
-         */
-        public static GLib.HashTable<string,string>[] get_contract (string uri, string mime) {
-            return { new GLib.HashTable<string,string> (null, null) };
-        }
-
-        /**
-         * generate contracts for arguments and filter them by common parent mimetype.
-         *
-         * @param locations Hashtable of locations
-         * @return Hashtable of available contracts
-         */
-        public static GLib.HashTable<string,string>[] get_selection_contracts (GLib.HashTable<string, string>[] locations) {
-            return { new GLib.HashTable<string,string> (null, null) };
-        }
-    }
-}
 
=== modified file 'lib/Widgets/AppMenu.vala'
--- lib/Widgets/AppMenu.vala	2013-03-20 15:42:25 +0000
+++ lib/Widgets/AppMenu.vala	2013-08-16 23:42:02 +0000
@@ -64,15 +64,6 @@
         }
 
         /**
-         * Create a new AppMenu, parameters are unused now.
-         */
-        [Deprecated (since = "granite-0.1")]
-        public AppMenu.with_urls (Gtk.Menu menu, string help_url, string translate_url, string bug_url) {
-            critical("This is a deprecated creation method: AppMenu.with_urls");
-            base (new Image.from_icon_name ("application-menu", IconSize.MENU), _("Menu"), menu);
-        }
-        
-        /**
          * This method adds makes a properly formatted App Menu menu from given menu
          * 
          * @param menu menu to format
 
=== modified file 'lib/Widgets/CellRendererBadge.vala'
--- lib/Widgets/CellRendererBadge.vala	2013-03-21 12:23:37 +0000
+++ lib/Widgets/CellRendererBadge.vala	2013-08-16 23:42:02 +0000
@@ -122,7 +122,6 @@
         ctx.render_layout (context, x, y, text_layout);
     }
 
-    [Deprecated (replacement = "Gtk.CellRenderer.get_preferred_size", since = "")]
     public override void get_size (Gtk.Widget widget, Gdk.Rectangle? cell_area,
                                    out int x_offset, out int y_offset,
                                    out int width, out int height)
 
=== modified file 'lib/Widgets/CellRendererExpander.vala'
--- lib/Widgets/CellRendererExpander.vala	2013-04-23 05:28:57 +0000
+++ lib/Widgets/CellRendererExpander.vala	2013-08-16 23:42:02 +0000
@@ -96,7 +96,6 @@
         revert_style_changes (widget);
     }
 
-    [Deprecated (replacement = "Gtk.CellRenderer.get_preferred_size", since = "")]
     public override void get_size (Gtk.Widget widget, Gdk.Rectangle? cell_area,
                                    out int x_offset, out int y_offset,
                                    out int width, out int height)
 
=== modified file 'lib/Widgets/CollapsiblePaned.vala'
--- lib/Widgets/CollapsiblePaned.vala	2013-03-20 15:42:25 +0000
+++ lib/Widgets/CollapsiblePaned.vala	2013-08-16 23:42:02 +0000
@@ -35,8 +35,6 @@
      */
     public class CollapsiblePaned : Gtk.Paned {
         public CollapseMode collapse_mode { get; set; default = CollapseMode.NONE; }
-        //public signal void shrink(); //TODO: Make the default action overwritable
-        //public new signal void expand(int saved_state); //TODO same
 
         private int saved_state = 10;
         private uint last_click_time = 0;
@@ -86,18 +84,4 @@
             return false;
         }
     }
-
-    [Deprecated (replacement = "Granite.Widgets.CollapsiblePaned", since = "granite-0.2")]
-    public class HCollapsablePaned : CollapsiblePaned {
-        public HCollapsablePaned () {
-            base (Gtk.Orientation.HORIZONTAL);
-        }
-    }
-
-    [Deprecated (replacement = "Granite.Widgets.CollapsiblePaned", since = "granite-0.2")]
-    public class VCollapsablePaned : CollapsiblePaned {
-        public VCollapsablePaned () {
-            base (Gtk.Orientation.VERTICAL);
-        }
-    }
 }
 
=== removed file 'lib/Widgets/ContractorMenu.vala'
--- lib/Widgets/ContractorMenu.vala	2013-04-22 19:05:09 +0000
+++ lib/Widgets/ContractorMenu.vala	1970-01-01 00:00:00 +0000
@@ -1,142 +0,0 @@
-/***
-    Copyright (C) 2012-2013 Andrea Basso <[e-mail]>
-
-    This program or library is free software; you can redistribute it
-    and/or modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 3 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-    Lesser General Public License for more details.
- 
-    You should have received a copy of the GNU Lesser General
-    Public License along with this library; if not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301 USA.
-***/
-
-/**
- * This class provides a simple menu for managing Contractor.
- */
-[Deprecated (since = "0.2")]
-public class Granite.Widgets.ContractorMenu : Gtk.Menu {
-    /**
-     * The Hashtable of available contracts
-     */
-    HashTable<string,string>[] contracts;
-    /**
-     * The Hashtable of executables
-     */
-    Gee.HashMap <string,string> execs;
-    public delegate void ContractCallback ();
-    private string filepath;
-    private string filemime;
-    
-    /**
-     * Passes when contract is clicked
-     */
-    public signal void contract_activated (string contract_name);
-    
-    /**
-     * Makes new Contractor Meu
-     *
-     * @param filename the filename of the file
-     * @param mime the mime-type of the file
-     */
-    public ContractorMenu (string filename, string mime) {
-        filepath = filename;
-        filemime = mime;
-        load_items (filename, mime);
-    }
-    
-    /**
-     * Adds new item to Contractor Menu
-     *
-     * @param name name of menu item
-     * @param icon_name the desired icon for menu item
-     * @param position desired position of menu item
-     * @param method method to be called when menu item is clicked
-     * @param use_stock tells whether to use stock for menu item
-     */
-    public void add_item (string name, string icon_name, int position, ContractCallback method, bool use_stock = true) {
-        var item = new Gtk.ImageMenuItem ();
-        item.set_always_show_image (true);
-        item.set_use_stock (use_stock);
-        var image = new Gtk.Image.from_icon_name (icon_name, Gtk.IconSize.MENU);
-        item.set_label (name);
-        item.set_image (image);
-        item.activate.connect (()=> {
-            contract_activated (name);
-            method();
-        });
-        insert(item, position);
-        item.show ();
-    }
-    
-    /**
-     * Deletes a group of menu items
-     *
-     * @param names of menu items to delete
-     */
-    public void name_blacklist (string[] names) {
-        this.foreach ((item)=> {
-            if (((Gtk.MenuItem)item).get_label () in names)
-                remove (item);
-        });
-    }
-    
-    private void load_items (string filename, string mime) {
-        contracts = Granite.Services.Contractor.get_contract (filename, mime);
-        execs = new Gee.HashMap<string,string> ();
-        
-        for (int i=0;i<contracts.length;i++) {
-            execs[contracts[i].lookup ("Name")] = contracts[i].lookup ("Exec");
-            
-            var item = new Gtk.ImageMenuItem ();
-            item.set_always_show_image (true);
-            var image = new Gtk.Image.from_icon_name (contracts[i].lookup ("IconName"), Gtk.IconSize.MENU);
-            item.set_label (contracts[i].lookup ("Name"));
-            item.set_image (image);
-            item.activate.connect ( ()=> {
-                try {
- 	                Process.spawn_command_line_async (execs.get(item.get_label ()));
- 	            } catch (Error e) {
- 	                error (e.message);
- 	            }
-            });
-            append (item);
-            item.show_all ();
-        }
-    }
-    
-    /**
-     * Updates Contractor menu items
-     *
-     * @param filename the filename of the file
-     * @param mime the mime-type of the file
-     */
-    public void update (string? filename, string? mime) {
-        this.foreach ((w) => {remove (w);});
-        
-        string fn = "";
-        string mm = "";
-        
-        if (filename != null) {
-            fn = filename;
-            filepath = filename;
-        } else {
-            fn = filepath;
-        }
-        
-        if (mime != null) {
-            mm = mime;
-            filemime = mime;
-        } else {
-            mm = filemime;
-        }
-    
-        load_items (fn, mm);
-    }
-}
 
=== removed file 'lib/Widgets/ContractorView.vala'
--- lib/Widgets/ContractorView.vala	2013-04-22 19:05:09 +0000
+++ lib/Widgets/ContractorView.vala	1970-01-01 00:00:00 +0000
@@ -1,217 +0,0 @@
-/***
-    Copyright (C) 2011-2013 Tom Beckmann <[e-mail]>
-
-    This program or library is free software; you can redistribute it
-    and/or modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 3 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-    Lesser General Public License for more details.
- 
-    You should have received a copy of the GNU Lesser General
-    Public License along with this library; if not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301 USA.
-***/
-
-using Gtk;
-
-/**
- * This class provides a simple way to look at contracts from Contractor
- */
-[Deprecated (since = "0.2")]
-public class Granite.Widgets.ContractorView : TreeView {
-    
-    /**
-     * indicates if it was possible to connect to contractor
-     */
-    public bool contractor_available;
-    
-    public delegate void ContractCallback ();
-    private Gee.HashMap<int, DelegateWrapper?> outsiders;
-    private int[] blacklisted_pos;
-    private ListStore list;
-
-    private struct DelegateWrapper { unowned ContractCallback method; }
-    
-    /**
-     * the index of the currently selected contract
-     */
-    public int selected {
-        get {
-            TreePath path;
-            this.get_cursor (out path, null);
-            return int.parse (path.to_string ());
-        }
-        set {
-            this.set_cursor (new TreePath.from_string (value.to_string ()), null, false);
-        }
-    }
-    
-    /**
-     * A contract was launched using double clicking
-     */
-    public signal void executed ();
-    
-    /**
-     * the original array of contracts returned by contractor
-     */
-    HashTable<string,string>[] contracts;
-    
-    /**
-     * Create the default ContractorView
-     *
-     * @param filename the file
-     * @param mime the mimetype of the file
-     * @param icon_size the size of the icon in pixel
-     * @param show_contract_name show the name of the contract in the list
-     */
-    public ContractorView (string filename, string mime, int icon_size = 32, bool show_contract_name = true) {
-        /* Setup the ListStore */
-        list = new ListStore (2, typeof (Gdk.Pixbuf), typeof (string));
-        outsiders = new Gee.HashMap<int, DelegateWrapper?> ();
-        this.model = list;
-        
-        /* GUI */
-        this.headers_visible = false;
-        this.hexpand = true;
-        
-        /* Events */
-        row_activated.connect (() => { 
-            run_selected ();
-            executed ();
-        });
-        
-        /* View */
-        var cell1 = new CellRendererPixbuf ();
-        cell1.set_padding (5, 8);
-        this.insert_column_with_attributes (-1, "", cell1, "pixbuf", 0);
-        var cell2 = new CellRendererText ();
-        cell2.set_padding (2, 8);
-        this.insert_column_with_attributes (-1, "", cell2, "markup", 1);
-
-        this.contracts = Granite.Services.Contractor.get_contract (filename, mime);
-        if (this.contracts == null || this.contracts.length == 0) {
-            warning ("You should install contractor (or no contracts found for this mime).\n");
-            contractor_available = false;
-            TreeIter it;
-            list.append (out it);
-            bool contractor_installed = this.contracts == null;
-            string message = contractor_installed ? _("Could not contact Contractor. You may need to install it") : _("No action found for this file");
-            try {
-                var icon = IconTheme.get_default ().load_icon (
-                    contractor_installed ? Gtk.Stock.DIALOG_ERROR : Gtk.Stock.DIALOG_INFO, 
-                    icon_size, 0);
-                list.set (it, 
-                    0, icon, 1, message);
-            }
-            catch (Error e) {
-                warning("%s\n", e.message);
-            }
-            set_sensitive(false);
-        }
-        else {
-            contractor_available = true;
-            
-            for (var i=0; i<this.contracts.length; i++){
-                TreeIter it;
-                list.append (out it);
-                string text = this.contracts[i].lookup ("Description");
-                if (show_contract_name)
-                    text = "<b>"+this.contracts[i].lookup ("Name")+"</b>\n"+text;
-                try{
-                    list.set (it, 
-                        0, IconTheme.get_default ().load_icon (this.contracts[i].lookup ("IconName"), 
-                        icon_size, 0), 1, text);
-                }
-                catch (Error e) {
-                    warning (e.message);
-                }
-            }
-            this.selected = 0;
-        }
-    }
-    
-    /**
-     * A method to add items to the tree
-     *
-     * @param name the name
-     * @param desc the description
-     * @param icon_name the name of the icon to show
-     * @param icon_size the size of the icon in pixel
-     * @param position the posion the item will be inserted at (first position  is 0)
-     * @param method a general method containing all the methods that should be called when the item is activated
-     *        (must return void and mustn't have any parameter)
-     */
-    public void add_item (string name, string desc, string icon_name, int icon_size, int position, ContractCallback method) {
-        TreeIter it;
-        list.insert (out it, position);
-        
-        string text = "<b>" + name + "</b>\n" + desc;
-        
-        try{
-            list.set (it, 0, IconTheme.get_default ().load_icon (icon_name, icon_size, 0), 1, text);
-        } catch (Error e) {
-            error (e.message);
-        }
-        
-        DelegateWrapper wr = { method };
-        outsiders[position] = wr;
-        
-        this.selected = 0;
-    }
-    
-    public void name_blacklist (string[] names) {
-        TreeIter it;
-        TreeIter it2;
-        Value value;
-        bool check;
-        int cur_pos = 0;
-        list.get_iter_first (out it);
-        list.get_iter_first (out it2);
-        
-        while (true) {
-	        list.get_value (it, 1, out value);
-	        check = list.iter_next (ref it2);
-	        string text = value.get_string ();
-	        
-	        if (text[3:text.index_of ("</b>")] in names) {
-	            list.remove (it);
-	            blacklisted_pos += cur_pos;
-            }
-	        if (!check)
-	            break;
-	            
-            it = it2;
-	        cur_pos++;	            
-        }
-    }
-        
-    
-    public void run_selected () {
-        if (this.selected in outsiders.keys ) {
-            outsiders[this.selected].method ();
-        } else {
-            try {
-                int corr = 0;
-                foreach (int i in outsiders.keys) { //adjust in case of items added
-                    if (i > this.selected)
-                        break;
-                    corr++;
-                }
-                foreach (int i in blacklisted_pos) { //adjust in case of items removed
-                    if (i > this.selected)
-                        break;
-                    corr--;
-                }
-                Process.spawn_command_line_async (
-                    this.contracts[this.selected-corr].lookup ("Exec"));
-            } catch (Error e) {
-                error (e.message);
-            }
-        }
-    }
-}
 
=== removed file 'lib/Widgets/SidebarPaned.vala'
--- lib/Widgets/SidebarPaned.vala	2013-03-21 12:23:37 +0000
+++ lib/Widgets/SidebarPaned.vala	1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-/***
-    Copyright (C) 2011-2013 Granite Developers
-
-    This program or library is free software; you can redistribute it
-    and/or modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 3 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-    Lesser General Public License for more details.
- 
-    You should have received a copy of the GNU Lesser General
-    Public License along with this library; if not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301 USA.
-
-    Authored by: Victor Eduardo <[e-mail]>
-***/
-
-[Deprecated (replacement = "Granite.Widgets.ThinPaned", since = "granite-0.2")]
-public class Granite.Widgets.SidebarPaned : ThinPaned {
-}
-