← Back to branch summary

~ubuntu-branches/ubuntu/lucid/evolution/lucid

« back to all changes in this revision

Viewing changes to widgets/misc/e-attachment-button.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2010-03-01 23:30:42 UTC
  • mfrom: (1.1.71 upstream)
  • Revision ID: james.westby@ubuntu.com-20100301233042-8mzqjvw6hk77f667
Tags: 2.28.3-0ubuntu1
https://launchpad.net/bugs/471852
https://launchpad.net/bugs/424416
https://launchpad.net/bugs/510529
https://launchpad.net/bugs/242954
https://launchpad.net/bugs/351617
https://launchpad.net/bugs/452921
https://launchpad.net/bugs/485831
* New upstream version:
  Bug Fixes:
  - #601551 - [PST] evolution crashed with SIGSEGV (lp: #471852) 
  - #554663 - Swap "Save" and "Save as Draft" accelerators in composer
              (lp: #424416)
  - #601787 - Double free in destroy_oof_data 
  - #602185 - Crash after 'Show only this calendar' 
  - #609042 - Convert quoted-printing to UTF-8 when copying to clipboard 
  - #610124 - Autosave errors dialogues can't be dismissed 
  - #607087 - Not all inlined text attachments are included in replies
  - #607741 - Move folder to claims it's copying in status bar 
  - #607458 - Fix format security warning 
  - #603480 - [bbdb] Traverse lists in destinations properly 
  - #602827 - Disable broken plugins automatically 
  - #607234 - Open received attachments as read-only 
  - #604670 - addressbook-export segfaults when specifying addressbook
  - #605485 - Keeps search from previous folder in message list 
  - #606449 - Empty mail-notification popups 
  - #599794 - Set composer as not changed on reply or forward action 
              (lp: #510529)
  - #605600 - Meeting reminders with wrong times (lp: #242954)
  - #565582 - Make sure the comp_data is not NULL before using it 
              (lp: #351617)
  - #606340 - Crash on non-utf8 letter in mail folder name 
  - #549988 - "Empty Trash" in Trash popup empties all Trash folders
  - #595501 - Crash on a changed mail filter action removal (lp: #452921)
  - #599615 - i18n support for emae and filter-bar when used as lib 
  - #250046 - Do not count Post To addresses when not shown (lp: #485831)
* debian/patches/90_autoconf.patch:
  - new version update 

Show diffs side-by-side

added added

removed removed

Lines of Context:
widgets/misc/e-attachment-button.c
41
41
        GtkWidget *expand_button;
42
42
        GtkWidget *toggle_button;
43
43
        GtkWidget *cell_view;
 
44
        GtkWidget *popup_menu;
44
45
 
45
46
        guint expandable : 1;
46
47
        guint expanded   : 1;
274
275
attachment_button_set_view (EAttachmentButton *button,
275
276
                            EAttachmentView *view)
276
277
{
277
 
        GtkWidget *menu;
 
278
        GtkWidget *popup_menu;
278
279
 
279
280
        g_return_if_fail (button->priv->view == NULL);
280
281
 
281
282
        button->priv->view = g_object_ref (view);
282
283
 
283
 
        menu = e_attachment_view_get_popup_menu (view);
 
284
        popup_menu = e_attachment_view_get_popup_menu (view);
284
285
 
285
286
        g_signal_connect_swapped (
286
 
                menu, "deactivate",
 
287
                popup_menu, "deactivate",
287
288
                G_CALLBACK (attachment_button_menu_deactivate_cb), button);
 
289
 
 
290
        /* Keep a reference to the popup menu so we can
 
291
         * disconnect the signal handler in dispose(). */
 
292
        button->priv->popup_menu = g_object_ref (popup_menu);
288
293
}
289
294
 
290
295
static void
396
401
                priv->cell_view = NULL;
397
402
        }
398
403
 
 
404
        if (priv->popup_menu != NULL) {
 
405
                g_signal_handlers_disconnect_matched (
 
406
                        priv->popup_menu, G_SIGNAL_MATCH_DATA,
 
407
                        0, 0, NULL, NULL, object);
 
408
                g_object_unref (priv->popup_menu);
 
409
                priv->popup_menu = NULL;
 
410
        }
 
411
 
399
412
        /* Chain up to parent's dispose() method. */
400
413
        G_OBJECT_CLASS (parent_class)->dispose (object);
401
414
}