diff options
| author | Tristan Van Berkom <tvb@src.gnome.org> | 2006-09-06 19:13:52 +0000 |
|---|---|---|
| committer | Tristan Van Berkom <tvb@src.gnome.org> | 2006-09-06 19:13:52 +0000 |
| commit | 35aaba25562a7eaa0ddb849fe0ee2e3401a7785b (patch) | |
| tree | a169c362c899a87c4979e7550b183b233ee34089 /src | |
| parent | 79a19889986cf667f3cbdc1758e8153bea49531a (diff) | |
| download | glade-35aaba25562a7eaa0ddb849fe0ee2e3401a7785b.tar.gz | |
Backing out multiple consecutive pastes from 3.0, reopening bug 345603.
* src/glade-command.c: Backing out multiple consecutive pastes from 3.0,
reopening bug 345603.
Diffstat (limited to 'src')
| -rw-r--r-- | src/glade-command.c | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/src/glade-command.c b/src/glade-command.c index 7d1f2313..c63943aa 100644 --- a/src/glade-command.c +++ b/src/glade-command.c @@ -1266,10 +1266,7 @@ glade_command_paste_execute (GladeCommandCutCopyPaste *me) for (list = me->widgets; list && list->data; list = list->next) { cdata = list->data; - - /* Pasted widgets arent on the clipboard */ - if (me->original_type == GLADE_CUT) - remove = g_list_prepend (remove, cdata->widget); + remove = g_list_prepend (remove, cdata->widget); if (cdata->parent != NULL) { @@ -1404,12 +1401,10 @@ glade_command_cut_execute (GladeCommandCutCopyPaste *me) for (list = me->widgets; list && list->data; list = list->next) { cdata = list->data; + add = g_list_prepend (add, cdata->widget); if (me->original_type == GLADE_CUT) { - /* Pasted widgets dont return to the clipboard */ - add = g_list_prepend (add, cdata->widget); - if ((special_child_type = g_object_get_data (cdata->widget->object, "special-child-type")) != NULL) @@ -1627,22 +1622,15 @@ glade_command_cut_copy_paste_common (GList *widgets, g_critical ("Internal widget in Cut/Copy/Paste"); /* Widget */ - if (type == GLADE_COPY || type == GLADE_PASTE) + if (type == GLADE_COPY) { cdata->widget = glade_widget_dup (widget); - /* Copy or not, we need a reference for GladeCommand, and * a global reference for Glade. */ cdata->widget = g_object_ref (G_OBJECT (cdata->widget)); - } - else - { - /* Only cut widgets are used directly and moved to and from the - * clipboard. - */ + } else cdata->widget = g_object_ref (G_OBJECT (widget)); - } /* Parent */ if (parent == NULL) |