comparison src/gtkconv.c @ 6371:8f94cce8faa5

[gaim-migrate @ 6876] I think I touched almost every file. Here's what happened. I started off fixing up the Makefile.am and configure.ac files to help with the core/UI split some. Then I got annoyed with the build_{allow,deny}_list() functions that everything used, and decided to core/UI split privacy. While doing that, I decided to redesign the dialog. So now, a lot has changed, but not really so much. Just that most files got affected. Oh yeah, and the UI stuff was taken out of internal.h and moved to gtkinternal.h. If you use this, please be aware of this change. committer: Tailor Script <tailor@pidgin.im>
author Christian Hammond <chipx86@chipx86.com>
date Tue, 05 Aug 2003 10:55:04 +0000
parents 9287c2897a07
children e9974608b319
comparison
equal deleted inserted replaced
6370:a4b83df2165b 6371:8f94cce8faa5
17 * You should have received a copy of the GNU General Public License 17 * You should have received a copy of the GNU General Public License
18 * along with this program; if not, write to the Free Software 18 * along with this program; if not, write to the Free Software
19 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 19 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
20 * 20 *
21 */ 21 */
22 #include "internal.h" 22 #include "gtkinternal.h"
23 23
24 #ifndef _WIN32 24 #ifndef _WIN32
25 # include <X11/Xlib.h> 25 # include <X11/Xlib.h>
26 #endif 26 #endif
27 27
45 #include "dnd-hints.h" 45 #include "dnd-hints.h"
46 #include "gtkblist.h" 46 #include "gtkblist.h"
47 #include "gtkconv.h" 47 #include "gtkconv.h"
48 #include "gtkimhtml.h" 48 #include "gtkimhtml.h"
49 #include "gtkpounce.h" 49 #include "gtkpounce.h"
50 #include "gtkprivacy.h"
50 #include "gtkutils.h" 51 #include "gtkutils.h"
51 #include "stock.h" 52 #include "stock.h"
52 53
53 #include "ui.h" 54 #include "ui.h"
54 55
513 } 514 }
514 515
515 static void 516 static void
516 block_cb(GtkWidget *widget, GaimConversation *conv) 517 block_cb(GtkWidget *widget, GaimConversation *conv)
517 { 518 {
518 GaimConnection *gc; 519 GaimAccount *account;
519 520
520 gc = gaim_conversation_get_gc(conv); 521 account = gaim_conversation_get_account(conv);
521 522
522 if (gc != NULL) 523 if (account != NULL && gaim_account_is_connected(account))
523 show_add_perm(gc, (char *)gaim_conversation_get_name(conv), FALSE); 524 gaim_gtk_request_add_permit(account, gaim_conversation_get_name(conv));
524 525
525 gtk_widget_grab_focus(GAIM_GTK_CONVERSATION(conv)->entry); 526 gtk_widget_grab_focus(GAIM_GTK_CONVERSATION(conv)->entry);
526 } 527 }
527 528
528 static void 529 static void