diff options
| author | Krzysztof Kosi??ski <tweenk.pl@gmail.com> | 2011-07-06 01:59:32 +0000 |
|---|---|---|
| committer | Krzysztof Kosiński <tweenk.pl@gmail.com> | 2011-07-06 01:59:32 +0000 |
| commit | e65a02ed32b78534739aba24929ece7c44dd967f (patch) | |
| tree | 13cf022f18f6b5bae46aad4bc339e512f069a514 /src/ui/dialog | |
| parent | Pull 2Geom revision 2013 (extra constructors for Rect). (diff) | |
| parent | Text edit dialog: Apply button should grab default only after adding to window (diff) | |
| download | inkscape-e65a02ed32b78534739aba24929ece7c44dd967f.tar.gz inkscape-e65a02ed32b78534739aba24929ece7c44dd967f.zip | |
Merge from trunk
(bzr r10347.1.5)
Diffstat (limited to 'src/ui/dialog')
| -rw-r--r-- | src/ui/dialog/dock-behavior.cpp | 2 | ||||
| -rw-r--r-- | src/ui/dialog/floating-behavior.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/ui/dialog/dock-behavior.cpp b/src/ui/dialog/dock-behavior.cpp index 47cbab485..25fa1739a 100644 --- a/src/ui/dialog/dock-behavior.cpp +++ b/src/ui/dialog/dock-behavior.cpp @@ -262,7 +262,7 @@ DockBehavior::onDesktopActivated(SPDesktop *desktop) } // we're done, allow next retransientizing not sooner than after 120 msec - gtk_timeout_add (120, (GtkFunction) sp_retransientize_again, (gpointer) floating_win); + g_timeout_add (120, (GSourceFunc) sp_retransientize_again, (gpointer) floating_win); } } diff --git a/src/ui/dialog/floating-behavior.cpp b/src/ui/dialog/floating-behavior.cpp index 35cc88090..6a086e0a1 100644 --- a/src/ui/dialog/floating-behavior.cpp +++ b/src/ui/dialog/floating-behavior.cpp @@ -220,7 +220,7 @@ FloatingBehavior::onDesktopActivated (SPDesktop *desktop) } // we're done, allow next retransientizing not sooner than after 120 msec - gtk_timeout_add (120, (GtkFunction) sp_retransientize_again, (gpointer) _d); + g_timeout_add (120, (GSourceFunc) sp_retransientize_again, (gpointer) _d); } |