X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fverbs.cpp;h=e40ffe1d69b3cc0e61af7c37504b68ce18e4c3d0;hb=9c2b2f3c7ba0cafbcc47dc92bff67662b7e4ab2f;hp=494181e555e5536700740f2c4fa713efe8cec17e;hpb=ab77eca6f2922852bbefbf56bb4e5279f6b13a5e;p=inkscape.git

diff --git a/src/verbs.cpp b/src/verbs.cpp
index 494181e55..e40ffe1d6 100644
--- a/src/verbs.cpp
+++ b/src/verbs.cpp
@@ -977,7 +977,7 @@ EditVerb::perform(SPAction *action, void *data, void */*pdata*/)
             break;
 
         case SP_VERB_EDIT_GUIDES_AROUND_PAGE:
-            sp_guide_create_guides_around_page(sp_desktop_document(dt));
+            sp_guide_create_guides_around_page(dt);
             break;
 
         case SP_VERB_EDIT_NEXT_PATHEFFECT_PARAMETER:
@@ -1606,7 +1606,7 @@ ZoomVerb::perform(SPAction *action, void *data, void */*pdata*/)
             // While drawing with the pen/pencil tool, zoom towards the end of the unfinished path
             if (tools_isactive(dt, TOOLS_FREEHAND_PENCIL) || tools_isactive(dt, TOOLS_FREEHAND_PEN)) {
                 SPCurve *rc = SP_DRAW_CONTEXT(ec)->red_curve;
-                if (rc->last_bpath()) {
+                if (!rc->is_empty()) {
                     NR::Point const zoom_to (rc->last_point());
                     dt->zoom_relative_keep_point(zoom_to, mul*zoom_inc);
                     break;
@@ -1624,7 +1624,7 @@ ZoomVerb::perform(SPAction *action, void *data, void */*pdata*/)
             // While drawing with the pen/pencil tool, zoom away from the end of the unfinished path
             if (tools_isactive(dt, TOOLS_FREEHAND_PENCIL) || tools_isactive(dt, TOOLS_FREEHAND_PEN)) {
                 SPCurve *rc = SP_DRAW_CONTEXT(ec)->red_curve;
-                if (rc->last_bpath()) {
+                if (!rc->is_empty()) {
                     NR::Point const zoom_to (rc->last_point());
                     dt->zoom_relative_keep_point(zoom_to, 1 / (mul*zoom_inc));
                     break;
@@ -2097,10 +2097,10 @@ FitCanvasVerb::perform(SPAction *action, void *data, void */*pdata*/)
 
     switch ((long) data) {
         case SP_VERB_FIT_CANVAS_TO_SELECTION:
-            fit_canvas_to_selection(dt);
+            verb_fit_canvas_to_selection(dt);
             break;
         case SP_VERB_FIT_CANVAS_TO_DRAWING:
-            fit_canvas_to_drawing(doc);
+            verb_fit_canvas_to_drawing(dt);
             break;
         case SP_VERB_FIT_CANVAS_TO_SELECTION_OR_DRAWING:
             fit_canvas_to_selection_or_drawing(dt);
@@ -2290,7 +2290,7 @@ Verb *Verb::_base_verbs[] = {
     new EditVerb(SP_VERB_EDIT_CLEAR_ALL, "EditClearAll", N_("Clea_r All"),
                  N_("Delete all objects from document"), NULL),
     new EditVerb(SP_VERB_EDIT_SELECT_ALL, "EditSelectAll", N_("Select Al_l"),
-                 N_("Select all objects or all nodes"), "selection_select_all"),
+                 N_("Select all objects or all nodes"), "edit-select-all"),
     new EditVerb(SP_VERB_EDIT_SELECT_ALL_IN_ALL_LAYERS, "EditSelectAllInAllLayers", N_("Select All in All La_yers"),
                  N_("Select all objects in all visible and unlocked layers"), "selection_select_all_in_all_layers"),
     new EditVerb(SP_VERB_EDIT_INVERT, "EditInvert", N_("In_vert Selection"),
@@ -2555,10 +2555,10 @@ Verb *Verb::_base_verbs[] = {
                  "zoom_2_to_1"),
 #ifdef HAVE_GTK_WINDOW_FULLSCREEN
     new ZoomVerb(SP_VERB_FULLSCREEN, "FullScreen", N_("_Fullscreen"), N_("Stretch this document window to full screen"),
-                 "fullscreen"),
+                 "view-fullscreen"),
 #endif /* HAVE_GTK_WINDOW_FULLSCREEN */
     new ZoomVerb(SP_VERB_VIEW_NEW, "ViewNew", N_("Duplic_ate Window"), N_("Open a new window with the same document"),
-                 "view_new"),
+                 "window-new"),
     new ZoomVerb(SP_VERB_VIEW_NEW_PREVIEW, "ViewNewPreview", N_("_New View Preview"),
                  N_("New View Preview"), NULL/*"view_new_preview"*/),