← Back to branch summary

~ubuntu-branches/ubuntu/karmic/seahorse-plugins/karmic

« back to all changes in this revision

Viewing changes to libseahorse/seahorse-util.c

  • Committer: Bazaar Package Importer
  • Author(s): Didier Roche
  • Date: 2009-02-15 21:59:58 UTC
  • mfrom: (1.1.5 upstream)
  • Revision ID: james.westby@ubuntu.com-20090215215958-secdqa7amdhhtg4z
Tags: 2.25.90-0ubuntu1
https://launchpad.net/bugs/329832
https://launchpad.net/bugs/271137
* New upstream version (LP: #329832)
  - Don't prompt for signer if only one private key (LP: #271137)
  - Bring name of preferences window into alignment with desktop file and
    documentation
  - Finish removing libgnome calls
  - Fix display of error messages
  - Translations: ko, bn_IN
* Fix (wrong url) and update debian/watch to take into account unstable version
* Add Vcs-Bzr tag to debian/control.in
* Re-generate debian/control

Show diffs side-by-side

added added

removed removed

Lines of Context:
libseahorse/seahorse-util.c
52
52
seahorse_util_show_error (GtkWindow *parent, const gchar *heading, const gchar *message)
53
53
{
54
54
        GtkWidget *error;
55
 
    gchar *t;
56
55
    
57
56
        g_return_if_fail (message);
58
57
    
59
 
    if (heading)
60
 
        t = g_strconcat("<big><b>", heading, "</b></big>\n\n", message, NULL);
 
58
        error = gtk_message_dialog_new (parent, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR,
 
59
                GTK_BUTTONS_CLOSE, NULL);
 
60
                
 
61
        if (heading)
 
62
        g_object_set (G_OBJECT (error), "text", heading, "secondary-text", message, NULL);
61
63
    else
62
 
        t = g_strdup (message);
63
 
        
64
 
        error = gtk_message_dialog_new_with_markup (parent, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR,
65
 
                GTK_BUTTONS_CLOSE, t, NULL);
66
 
    g_free (t);
67
 
        
 
64
        g_object_set (G_OBJECT (error), "text", message, NULL);
 
65
                
68
66
        gtk_dialog_run (GTK_DIALOG (error));
69
67
        gtk_widget_destroy (error);
70
68
}