diff options
| author | jtx <javier.arraiza@marker.es> | 2013-03-04 11:34:32 +0000 |
|---|---|---|
| committer | jtx <javier.arraiza@marker.es> | 2013-03-04 11:34:32 +0000 |
| commit | bac1d241af62679c8d1824c6162965699914c39c (patch) | |
| tree | c2595c5fa5a11288ec3780e75f943480e19f86e1 /src/widgets/text-toolbar.cpp | |
| parent | Update from branch (diff) | |
| parent | Use ink_cairo_surface_filter when converting surfaces between linearRGB and s... (diff) | |
| download | inkscape-bac1d241af62679c8d1824c6162965699914c39c.tar.gz inkscape-bac1d241af62679c8d1824c6162965699914c39c.zip | |
merge from master branch
(bzr r11950.3.5)
Diffstat (limited to 'src/widgets/text-toolbar.cpp')
| -rw-r--r-- | src/widgets/text-toolbar.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/widgets/text-toolbar.cpp b/src/widgets/text-toolbar.cpp index cc6d02ea8..ef7d31d76 100644 --- a/src/widgets/text-toolbar.cpp +++ b/src/widgets/text-toolbar.cpp @@ -18,8 +18,8 @@ * * Copyright (C) 2004 David Turner * Copyright (C) 2003 MenTaLguY - * Copyright (C) 1999-2013 authors * Copyright (C) 2001-2002 Ximian, Inc. + * Copyright (C) 1999-2013 authors * * Released under GNU GPL, read the file 'COPYING' for more information */ @@ -170,7 +170,7 @@ static void sp_text_fontfamily_value_changed( Ink_ComboBoxEntry_Action *act, GOb // active text set in sp_text_toolbox_selection_changed() SPCSSAttr *css = sp_repr_css_attr_new (); - fontlister->set_css( css ); + fontlister->fill_css( css ); SPDesktop *desktop = SP_ACTIVE_DESKTOP; sp_desktop_set_style (desktop, css, true, true); // Results in selection change called twice. @@ -272,7 +272,7 @@ static void sp_text_fontstyle_value_changed( Ink_ComboBoxEntry_Action *act, GObj // active text set in sp_text_toolbox_seletion_changed() SPCSSAttr *css = sp_repr_css_attr_new (); - fontlister->set_css( css ); + fontlister->fill_css( css ); SPDesktop *desktop = SP_ACTIVE_DESKTOP; sp_desktop_set_style (desktop, css, true, true); |