From 148614d638b14b5a4b7b3ceb8e0b0fc341ba6e05 Mon Sep 17 00:00:00 2001
From: Marc Jeanmougin <marc@jeanmougin.fr>
Date: Wed, 9 Nov 2016 22:08:25 +0100
Subject: resizable undocked dialogs

(bzr r15233)
---
 src/ui/widget/dock-item.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/ui/widget/dock-item.cpp')

diff --git a/src/ui/widget/dock-item.cpp b/src/ui/widget/dock-item.cpp
index 979c09d2f..2860df12e 100644
--- a/src/ui/widget/dock-item.cpp
+++ b/src/ui/widget/dock-item.cpp
@@ -423,6 +423,8 @@ void
 DockItem::_onStateChanged(State /*prev_state*/, State new_state)
 {
     _window = getWindow();
+    if(_window)
+        _window->set_type_hint(Gdk::WINDOW_TYPE_HINT_NORMAL);
 
     if (new_state == FLOATING_STATE && _window) {
         _window->signal_hide().connect(sigc::mem_fun(*this, &Inkscape::UI::Widget::DockItem::_onHideWindow));
-- 
cgit v1.2.3


From d14c66ec084bb5a53e1a47942cca89f189da8caf Mon Sep 17 00:00:00 2001
From: Alex Valavanis <valavanisalex@gmail.com>
Date: Tue, 27 Dec 2016 14:38:57 +0000
Subject: Rm more deprecated Gtk::Stock

(bzr r15367)
---
 src/ui/widget/dock-item.cpp | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'src/ui/widget/dock-item.cpp')

diff --git a/src/ui/widget/dock-item.cpp b/src/ui/widget/dock-item.cpp
index 2860df12e..d124854ae 100644
--- a/src/ui/widget/dock-item.cpp
+++ b/src/ui/widget/dock-item.cpp
@@ -15,7 +15,6 @@
 #include "widgets/icon.h"
 
 #include <gtkmm/icontheme.h>
-#include <gtkmm/stockitem.h>
 #include <glibmm/exceptionhandler.h>
 
 namespace Inkscape {
@@ -47,18 +46,11 @@ DockItem::DockItem(Dock& dock, const Glib::ustring& name, const Glib::ustring& l
         if (!iconTheme->has_icon(icon_name)) {
             Inkscape::queueIconPrerender( INKSCAPE_ICON(icon_name.data()), Inkscape::ICON_SIZE_MENU );
         }
-        // Icon might be in the icon theme, or might be a stock item. Check the proper source:
         if ( iconTheme->has_icon(icon_name) ) {
             int width = 0;
             int height = 0;
             Gtk::IconSize::lookup(Gtk::ICON_SIZE_MENU, width, height);
             _icon_pixbuf = iconTheme->load_icon(icon_name, width);
-        } else {
-            Gtk::StockItem item;
-            Gtk::StockID stockId(icon_name);
-            if ( Gtk::StockItem::lookup(stockId, item) ) {
-                _icon_pixbuf = _dock.getWidget().render_icon_pixbuf( stockId, Gtk::ICON_SIZE_MENU );
-            }
         }
     }
 
-- 
cgit v1.2.3