Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 438810 Details for
Bug 587098
media-gfx/inkscape-0.91-r3 - fix compilation with glibmm-2.48
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
patch from https://bugs.launchpad.net/inkscape/+bug/1567485
inkscape-0.91-r3-fix-gtkmm-2.48.patch (text/plain), 2.28 KB, created by
Daniel Maxime
on 2016-06-25 23:24:55 UTC
(
hide
)
Description:
patch from https://bugs.launchpad.net/inkscape/+bug/1567485
Filename:
MIME Type:
Creator:
Daniel Maxime
Created:
2016-06-25 23:24:55 UTC
Size:
2.28 KB
patch
obsolete
>=== modified file 'src/ui/clipboard.cpp' >--- src/ui/clipboard.cpp 2016-04-02 15:15:43 +0000 >+++ src/ui/clipboard.cpp 2016-04-07 16:30:32 +0000 >@@ -146,8 +146,6 @@ > void _setClipboardColor(guint32); > void _userWarn(SPDesktop *, char const *); > >- void _inkscape_wait_for_targets(std::list<Glib::ustring> &); >- > // private properites > SPDocument *_clipboardSPDoc; ///< Document that stores the clipboard until someone requests it > Inkscape::XML::Node *_defs; ///< Reference to the clipboard document's defs node >@@ -1302,9 +1300,7 @@ > */ > Glib::ustring ClipboardManagerImpl::_getBestTarget() > { >- // GTKmm's wait_for_targets() is broken, see the comment in _inkscape_wait_for_targets() >- std::list<Glib::ustring> targets; // = _clipboard->wait_for_targets(); >- _inkscape_wait_for_targets(targets); >+ std::list<Glib::ustring> targets = _clipboard->wait_for_targets(); > > // clipboard target debugging snippet > /* >@@ -1456,39 +1452,6 @@ > desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, msg); > } > >- >-// GTKMM's clipboard::wait_for_targets is buggy and might return bogus, see >-// >-// https://bugs.launchpad.net/inkscape/+bug/296778 >-// http://mail.gnome.org/archives/gtk-devel-list/2009-June/msg00062.html >-// >-// for details. Until this has been fixed upstream we will use our own implementation >-// of this method, as copied from /gtkmm-2.16.0/gtk/gtkmm/clipboard.cc. >-void ClipboardManagerImpl::_inkscape_wait_for_targets(std::list<Glib::ustring> &listTargets) >-{ >- //Get a newly-allocated array of atoms: >- GdkAtom* targets = NULL; >- gint n_targets = 0; >- gboolean test = gtk_clipboard_wait_for_targets( gtk_clipboard_get(GDK_SELECTION_CLIPBOARD), &targets, &n_targets ); >- if (!test || (targets == NULL)) { >- return; >- } >- >- //Add the targets to the C++ container: >- for (int i = 0; i < n_targets; i++) >- { >- //Convert the atom to a string: >- gchar* const atom_name = gdk_atom_name(targets[i]); >- >- Glib::ustring target; >- if (atom_name) { >- target = Glib::ScopedPtr<char>(atom_name).get(); //This frees the gchar*. >- } >- >- listTargets.push_back(target); >- } >-} >- > /* ####################################### > ClipboardManager class > ####################################### */ >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 587098
:
438808
|
438810
|
438812
|
438814