comparison pidgin/gtkconv.c @ 18821:0765cf9331f6

warning fixes
author Sean Egan <seanegan@gmail.com>
date Mon, 06 Aug 2007 21:16:05 +0000
parents 25c2af20affe
children 510cd9fa91aa
comparison
equal deleted inserted replaced
18820:25c2af20affe 18821:0765cf9331f6
6254 6254
6255 if ((fields & PIDGIN_CONV_COLORIZE_TITLE) || 6255 if ((fields & PIDGIN_CONV_COLORIZE_TITLE) ||
6256 (fields & PIDGIN_CONV_SET_TITLE) || 6256 (fields & PIDGIN_CONV_SET_TITLE) ||
6257 (fields & PIDGIN_CONV_TOPIC)) 6257 (fields & PIDGIN_CONV_TOPIC))
6258 { 6258 {
6259 char *title, *truncate = NULL, truncchar; 6259 char *title, *truncate = NULL, truncchar = '\0';
6260 PurpleConvIm *im = NULL; 6260 PurpleConvIm *im = NULL;
6261 PurpleAccount *account = purple_conversation_get_account(conv); 6261 PurpleAccount *account = purple_conversation_get_account(conv);
6262 PurpleBuddy *buddy = NULL; 6262 PurpleBuddy *buddy = NULL;
6263 PurplePresence *p = NULL; 6263 PurplePresence *p = NULL;
6264 char *markup = NULL; 6264 char *markup = NULL;
6597 pidgin_gdk_pixbuf_make_round(scale); 6597 pidgin_gdk_pixbuf_make_round(scale);
6598 gtkconv->u.im->icon_container = gtk_vbox_new(FALSE, 0); 6598 gtkconv->u.im->icon_container = gtk_vbox_new(FALSE, 0);
6599 6599
6600 event = gtk_event_box_new(); 6600 event = gtk_event_box_new();
6601 gtk_container_add(GTK_CONTAINER(gtkconv->u.im->icon_container), event); 6601 gtk_container_add(GTK_CONTAINER(gtkconv->u.im->icon_container), event);
6602 gtk_event_box_set_visible_window(event, FALSE); 6602 gtk_event_box_set_visible_window(GTK_EVENT_BOX(event), FALSE);
6603 gtk_widget_add_events(event, 6603 gtk_widget_add_events(event,
6604 GDK_POINTER_MOTION_MASK | GDK_LEAVE_NOTIFY_MASK); 6604 GDK_POINTER_MOTION_MASK | GDK_LEAVE_NOTIFY_MASK);
6605 g_signal_connect(G_OBJECT(event), "button-press-event", 6605 g_signal_connect(G_OBJECT(event), "button-press-event",
6606 G_CALLBACK(icon_menu), gtkconv); 6606 G_CALLBACK(icon_menu), gtkconv);
6607 g_signal_connect(G_OBJECT(event), "motion-notify-event", 6607 g_signal_connect(G_OBJECT(event), "motion-notify-event",
8552 PidginConversation *focus_gtkconv; 8552 PidginConversation *focus_gtkconv;
8553 GtkWidget *tab_cont = gtkconv->tab_cont; 8553 GtkWidget *tab_cont = gtkconv->tab_cont;
8554 GtkWidget *close_image; 8554 GtkWidget *close_image;
8555 PurpleConversationType conv_type; 8555 PurpleConversationType conv_type;
8556 const gchar *tmp_lab; 8556 const gchar *tmp_lab;
8557 gint close_button_width, close_button_height, focus_width, focus_pad;
8558 8557
8559 conv_type = purple_conversation_get_type(conv); 8558 conv_type = purple_conversation_get_type(conv);
8560 8559
8561 win->gtkconvs = g_list_append(win->gtkconvs, gtkconv); 8560 win->gtkconvs = g_list_append(win->gtkconvs, gtkconv);
8562 gtkconv->win = win; 8561 gtkconv->win = win;
8565 pidgin_conv_tab_pack(win, ((PidginConversation*)win->gtkconvs->data)); 8564 pidgin_conv_tab_pack(win, ((PidginConversation*)win->gtkconvs->data));
8566 8565
8567 8566
8568 /* Close button. */ 8567 /* Close button. */
8569 gtkconv->close = gtk_event_box_new(); 8568 gtkconv->close = gtk_event_box_new();
8570 gtk_event_box_set_visible_window(gtkconv->close, FALSE); 8569 gtk_event_box_set_visible_window(GTK_EVENT_BOX(gtkconv->close), FALSE);
8571 close_image = gtk_label_new(NULL); 8570 close_image = gtk_label_new(NULL);
8572 gtk_label_set_markup(GTK_LABEL(close_image),"<b>×</b>"); 8571 gtk_label_set_markup(GTK_LABEL(close_image),"<b>×</b>");
8573 gtk_widget_show(close_image); 8572 gtk_widget_show(close_image);
8574 gtk_container_add(GTK_CONTAINER(gtkconv->close), close_image); 8573 gtk_container_add(GTK_CONTAINER(gtkconv->close), close_image);
8575 gtk_tooltips_set_tip(gtkconv->tooltips, gtkconv->close, 8574 gtk_tooltips_set_tip(gtkconv->tooltips, gtkconv->close,