Mercurial > pidgin.yaz
diff pidgin/gtkpounce.c @ 29663:af5c36fe8d6f
propagate from branch 'im.pidgin.pidgin' (head e602a35f60e3d423d43bacc72fcb7239c8b43cf0)
to branch 'im.pidgin.cpw.attention_ui' (head d6e2d83ffb82d0028d802e5959d57de1d61b4faf)
| author | Marcus Lundblad <ml@update.uu.se> |
|---|---|
| date | Tue, 13 Jan 2009 18:39:52 +0000 |
| parents | fe5179d40a51 |
| children | 94a6eb10c691 |
line wrap: on
line diff
--- a/pidgin/gtkpounce.c Thu Jan 01 21:19:11 2009 +0000 +++ b/pidgin/gtkpounce.c Tue Jan 13 18:39:52 2009 +0000 @@ -484,7 +484,7 @@ void pidgin_pounce_editor_show(PurpleAccount *account, const char *name, - PurplePounce *cur_pounce) + PurplePounce *cur_pounce) { PidginPounceDialog *dialog; GtkWidget *window; @@ -848,10 +848,12 @@ g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(cancel_cb), dialog); - /* Save button */ - dialog->save_button = button = gtk_dialog_add_button(GTK_DIALOG(window), GTK_STOCK_SAVE, GTK_RESPONSE_OK); + /* Save/Add button */ + dialog->save_button = button = gtk_dialog_add_button(GTK_DIALOG(window), + (cur_pounce == NULL ? GTK_STOCK_ADD : GTK_STOCK_SAVE), + GTK_RESPONSE_OK); g_signal_connect(G_OBJECT(button), "clicked", - G_CALLBACK(save_pounce_cb), dialog); + G_CALLBACK(save_pounce_cb), dialog); if (*gtk_entry_get_text(GTK_ENTRY(dialog->buddy_entry)) == '\0') gtk_widget_set_sensitive(button, FALSE); @@ -1274,7 +1276,6 @@ g_signal_connect(G_OBJECT(treeview), "button_press_event", G_CALLBACK(pounce_double_click_cb), dialog); - gtk_container_add(GTK_CONTAINER(sw), treeview); gtk_widget_show(treeview);