summaryrefslogtreecommitdiffstats
path: root/src/dialogs
diff options
context:
space:
mode:
authorStephen Silver <sasilver@yahoo.com>2008-07-14 10:19:53 +0000
committersasilver <sasilver@users.sourceforge.net>2008-07-14 10:19:53 +0000
commit7961d4e7e17ebda57ad576e768a4e4bd69c18a95 (patch)
tree4bb59bafe627b99796b15860b09d5882e2e86101 /src/dialogs
parentsmall code cleanup using newly discovered 2geom method :) (diff)
downloadinkscape-7961d4e7e17ebda57ad576e768a4e4bd69c18a95.tar.gz
inkscape-7961d4e7e17ebda57ad576e768a4e4bd69c18a95.zip
Some improvements to my title/desc stuff of revision 18759 (see bug 171024).
(bzr r6290)
Diffstat (limited to 'src/dialogs')
-rw-r--r--src/dialogs/item-properties.cpp14
1 files changed, 2 insertions, 12 deletions
diff --git a/src/dialogs/item-properties.cpp b/src/dialogs/item-properties.cpp
index fb7753d00..25eafa9a1 100644
--- a/src/dialogs/item-properties.cpp
+++ b/src/dialogs/item-properties.cpp
@@ -442,14 +442,9 @@ sp_item_widget_label_changed( GtkWidget */*widget*/, SPWidget *spw )
/* Retrieve the title */
GtkWidget *w = GTK_WIDGET(gtk_object_get_data(GTK_OBJECT(spw), "title"));
gchar *title = (gchar *)gtk_entry_get_text(GTK_ENTRY (w));
- g_assert(title != NULL);
- gchar *old_title = obj->title();
- if (old_title == NULL || strcmp(title, old_title)) {
- obj->setTitle(title);
+ if (obj->setTitle(title))
sp_document_done(SP_ACTIVE_DOCUMENT, SP_VERB_DIALOG_ITEM,
_("Set object title"));
- }
- g_free(old_title);
/* Retrieve the description */
GtkTextView *tv = GTK_TEXT_VIEW(gtk_object_get_data(GTK_OBJECT(spw), "desc"));
@@ -457,14 +452,9 @@ sp_item_widget_label_changed( GtkWidget */*widget*/, SPWidget *spw )
GtkTextIter start, end;
gtk_text_buffer_get_bounds(buf, &start, &end);
gchar *desc = gtk_text_buffer_get_text(buf, &start, &end, TRUE);
- g_assert(desc != NULL);
- gchar *old_desc = obj->desc();
- if (old_desc == NULL || strcmp(desc, old_desc)) {
- obj->setDesc(desc);
+ if (obj->setDesc(desc))
sp_document_done(SP_ACTIVE_DOCUMENT, SP_VERB_DIALOG_ITEM,
_("Set object description"));
- }
- g_free(old_desc);
g_free(desc);
gtk_object_set_data (GTK_OBJECT (spw), "blocked", GUINT_TO_POINTER (FALSE));