← Back to branch summary

~ubuntu-branches/ubuntu/karmic/pidgin/karmic

« back to all changes in this revision

Viewing changes to pidgin/gtkpounce.c

  • Committer: Bazaar Package Importer
  • Author(s): Didier Roche
  • Date: 2009-02-23 18:30:20 UTC
  • mfrom: (1.1.16 upstream)
  • Revision ID: james.westby@ubuntu.com-20090223183020-jmne1l61866atkd8
Tags: 1:2.5.4-2ubuntu1
https://launchpad.net/bugs/316636
* Merge from debian, remaining changes: (LP: #316636)
  - debian/control:
    + Add Build-Deps on liblaunchpad-integration-dev, intltool,
    network-manager-dev
    + Add epoch in dependencies
    + Drop the libpurple0 dependency on libpurple-bin
  - debian/libpurple0.symbols: add epoch to symbol
  - debian/pidgin-dbg.preinst, debian/pidgin-dev.preinst,
    debian/pidgin.preinst: add epoch
  - Update debian/prefs.xml to set the notify plugin prefs
    /plugins/gtk/X11/notify/*, set /pidgin/plugins/loaded to load
    the notify plugin and enable the standard logging options by default
  - debian/rules:
    + remove --disable-nm as nm has been fixed in Ubuntu
    + Add X-Ubuntu-Gettext-Domain to the desktop file and update the
      translation templates in common-install-impl::
  - debian/patches:
    + 02_lpi.patch for LP integration
    + 04_let_crasher_for_apport.patch to stop catching the SIGSEGV signal
      and let apport handle it
    + 05_default_to_irc_ubuntu_com.patch to set the default IRC
      server to irc.ubuntu.com
    + 70_autoconf.patch
    + fix-icons-backport-from-2.5.5mtn.diff:
      Fix to see buddy icons for new Windows Live users.
      The patch will be included in pidgin-2.5.5 

Show diffs side-by-side

added added

removed removed

Lines of Context:
pidgin/gtkpounce.c
484
484
 
485
485
void
486
486
pidgin_pounce_editor_show(PurpleAccount *account, const char *name,
487
 
                                                        PurplePounce *cur_pounce)
 
487
                          PurplePounce *cur_pounce)
488
488
{
489
489
        PidginPounceDialog *dialog;
490
490
        GtkWidget *window;
848
848
        g_signal_connect(G_OBJECT(button), "clicked",
849
849
                                         G_CALLBACK(cancel_cb), dialog);
850
850
 
851
 
        /* Save button */
852
 
        dialog->save_button = button = gtk_dialog_add_button(GTK_DIALOG(window), GTK_STOCK_SAVE, GTK_RESPONSE_OK);
 
851
        /* Save/Add button */
 
852
        dialog->save_button = button = gtk_dialog_add_button(GTK_DIALOG(window),
 
853
                                                             (cur_pounce == NULL ? GTK_STOCK_ADD : GTK_STOCK_SAVE),
 
854
                                                             GTK_RESPONSE_OK);
853
855
        g_signal_connect(G_OBJECT(button), "clicked",
854
 
                                         G_CALLBACK(save_pounce_cb), dialog);
 
856
                         G_CALLBACK(save_pounce_cb), dialog);
855
857
 
856
858
        if (*gtk_entry_get_text(GTK_ENTRY(dialog->buddy_entry)) == '\0')
857
859
                gtk_widget_set_sensitive(button, FALSE);
1274
1276
        g_signal_connect(G_OBJECT(treeview), "button_press_event",
1275
1277
                                         G_CALLBACK(pounce_double_click_cb), dialog);
1276
1278
 
1277
 
 
1278
1279
        gtk_container_add(GTK_CONTAINER(sw), treeview);
1279
1280
        gtk_widget_show(treeview);
1280
1281