changeset 804:17def2bb9720

[gaim-migrate @ 814] 17:24:37 RobFlynn: Reformatted? 17:24:59 EWarmenhoven: well, "preferences" "plugins" and "perl". one of these things is not like the others committer: Tailor Script <tailor@pidgin.im>
author Eric Warmenhoven <eric@warmenhoven.org>
date Thu, 31 Aug 2000 00:25:25 +0000
parents 7f75b17d4e14
children 2f0655e185b8
files src/about.c src/aim.c src/buddy.c src/conversation.c src/dialogs.c src/util.c
diffstat 6 files changed, 37 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/about.c	Wed Aug 30 23:56:09 2000 +0000
+++ b/src/about.c	Thu Aug 31 00:25:25 2000 +0000
@@ -90,6 +90,7 @@
 		gtk_box_pack_start(GTK_BOX(vbox), pixmap, TRUE, TRUE, 0);
 		gtk_widget_show(pixmap);
 		gdk_pixmap_unref(pm);
+		gdk_bitmap_unref(bm);
 		
 		label = gtk_label_new(
 "GAIM is a client that supports AOL's Instant Messenger protocol\nwritten under the GTK\n" 
--- a/src/aim.c	Wed Aug 30 23:56:09 2000 +0000
+++ b/src/aim.c	Thu Aug 31 00:25:25 2000 +0000
@@ -492,6 +492,7 @@
 	gtk_table_attach(GTK_TABLE(table), pmw, 0,2,0,1,0,0,5,5);
 	gtk_widget_show(pmw);
 	gdk_pixmap_unref(pm);
+	gdk_bitmap_unref(mask);
 #endif /* USE_APPLET */
 
         
--- a/src/buddy.c	Wed Aug 30 23:56:09 2000 +0000
+++ b/src/buddy.c	Thu Aug 31 00:25:25 2000 +0000
@@ -220,6 +220,7 @@
 		pic = gtk_pixmap_new(pm, bm);
 		gtk_widget_show(pic);
 		gdk_pixmap_unref(pm);
+		gdk_bitmap_unref(bm);
 		label = GTK_BIN(button)->child;
 		gtk_container_remove(GTK_CONTAINER(button), label);
 		gtk_container_add(GTK_CONTAINER(button), pic);
@@ -825,6 +826,7 @@
 			
 	gtk_widget_show(b->pix);
 	gdk_pixmap_unref(pm);
+	gdk_bitmap_unref(bm);
 
 	b->label = gtk_label_new(buddy);
 	gtk_misc_set_alignment(GTK_MISC(b->label), 0.0, 0.5);
@@ -1406,6 +1408,7 @@
                         if (display_options & OPT_DISP_SHOW_PIXMAPS)
 				gtk_widget_show(b->pix);
 			gdk_pixmap_unref(pm);
+			gdk_bitmap_unref(bm);
 
 			pm = gdk_pixmap_create_from_xpm_d(blist->window, &bm,
 				NULL, (gchar **)login_icon_xpm);
@@ -1413,6 +1416,7 @@
         		if ( ticker_prefs & OPT_DISP_SHOW_BUDDYTICKER )
 				BuddyTickerAddUser( b->name, pm, bm );	
 			gdk_pixmap_unref(pm);
+			gdk_bitmap_unref(bm);
 
 			if (display_options & OPT_DISP_SHOW_LOGON) {
 				struct conversation *c = find_conversation(b->name);
@@ -1451,72 +1455,84 @@
                                                                   NULL, (gchar **)away_icon_xpm);
                                 gtk_pixmap_set(GTK_PIXMAP(b->pix), pm, bm);
 				gdk_pixmap_unref(pm);
+				gdk_bitmap_unref(bm);
         			if ( ticker_prefs & OPT_DISP_SHOW_BUDDYTICKER )
 				{
 					pm = gdk_pixmap_create_from_xpm_d(blist->window, &bm,
                                                                   NULL, (gchar **)away_icon_xpm);
 					BuddyTickerSetPixmap(b->name, pm, bm);
 					gdk_pixmap_unref(pm);
+					gdk_bitmap_unref(bm);
 				}
                         } else if (b->uc & UC_AOL) {
                                 pm = gdk_pixmap_create_from_xpm_d(blist->window, &bm,
                                                                   NULL, (gchar **)aol_icon_xpm);
                                 gtk_pixmap_set(GTK_PIXMAP(b->pix), pm, bm);
 				gdk_pixmap_unref(pm);
+				gdk_bitmap_unref(bm);
         			if ( ticker_prefs & OPT_DISP_SHOW_BUDDYTICKER )
 				{
 					pm = gdk_pixmap_create_from_xpm_d(blist->window, &bm,
                                                                   NULL, (gchar **)aol_icon_xpm);
 					BuddyTickerSetPixmap(b->name, pm, bm);
 					gdk_pixmap_unref(pm);
+					gdk_bitmap_unref(bm);
 				}
                         } else if (b->uc & UC_NORMAL) {
                                 pm = gdk_pixmap_create_from_xpm_d(blist->window, &bm,
                                                                   NULL, (gchar **)free_icon_xpm);
                                 gtk_pixmap_set(GTK_PIXMAP(b->pix), pm, bm);
 				gdk_pixmap_unref(pm);
+				gdk_bitmap_unref(bm);
         			if ( ticker_prefs & OPT_DISP_SHOW_BUDDYTICKER )
 				{
 					pm = gdk_pixmap_create_from_xpm_d(blist->window, &bm,
                                                                   NULL, (gchar **)free_icon_xpm);
 					BuddyTickerSetPixmap(b->name, pm, bm);
 					gdk_pixmap_unref(pm);
+					gdk_bitmap_unref(bm);
 				}
                         } else if (b->uc & UC_ADMIN) {
                                 pm = gdk_pixmap_create_from_xpm_d(blist->window, &bm,
                                                                   NULL, (gchar **)admin_icon_xpm);
                                 gtk_pixmap_set(GTK_PIXMAP(b->pix), pm, bm);
 				gdk_pixmap_unref(pm);
+				gdk_bitmap_unref(bm);
         			if ( ticker_prefs & OPT_DISP_SHOW_BUDDYTICKER )
 				{
 					pm = gdk_pixmap_create_from_xpm_d(blist->window, &bm,
                                                                   NULL, (gchar **)admin_icon_xpm);
 					BuddyTickerSetPixmap(b->name, pm, bm);
 					gdk_pixmap_unref(pm);
+					gdk_bitmap_unref(bm);
 				}
                         } else if (b->uc & UC_UNCONFIRMED) {
                                 pm = gdk_pixmap_create_from_xpm_d(blist->window, &bm,
                                                                   NULL, (gchar **)dt_icon_xpm);
                                 gtk_pixmap_set(GTK_PIXMAP(b->pix), pm, bm);
 				gdk_pixmap_unref(pm);
+				gdk_bitmap_unref(bm);
         			if ( ticker_prefs & OPT_DISP_SHOW_BUDDYTICKER )
 				{
 					pm = gdk_pixmap_create_from_xpm_d(blist->window, &bm,
                                                                   NULL, (gchar **)dt_icon_xpm);
 					BuddyTickerSetPixmap(b->name, pm, bm);
 					gdk_pixmap_unref(pm);
+					gdk_bitmap_unref(bm);
 				}
                         } else {
                                 pm = gdk_pixmap_create_from_xpm_d(blist->window, &bm,
                                                                   NULL, (gchar **)no_icon_xpm);
                                 gtk_pixmap_set(GTK_PIXMAP(b->pix), pm, bm);
 				gdk_pixmap_unref(pm);
+				gdk_bitmap_unref(bm);
         			if ( ticker_prefs & OPT_DISP_SHOW_BUDDYTICKER )
 				{
 					pm = gdk_pixmap_create_from_xpm_d(blist->window, &bm,
                                                                   NULL, (gchar **)no_icon_xpm);
 					BuddyTickerSetPixmap(b->name, pm, bm);
 					gdk_pixmap_unref(pm);
+					gdk_bitmap_unref(bm);
 				}
                         }
                         if (display_options & OPT_DISP_SHOW_PIXMAPS)
@@ -1536,11 +1552,13 @@
                         if (display_options & OPT_DISP_SHOW_PIXMAPS)
 				gtk_widget_show(b->pix);
 			gdk_pixmap_unref(pm);
+			gdk_bitmap_unref(bm);
 			pm = gdk_pixmap_create_from_xpm_d(blist->window, &bm,
 				NULL, (gchar **)logout_icon_xpm);
         		if ( ticker_prefs & OPT_DISP_SHOW_BUDDYTICKER )
 				BuddyTickerSetPixmap( b->name, pm, bm );
 			gdk_pixmap_unref(pm);
+			gdk_bitmap_unref(bm);
 			if (display_options & OPT_DISP_SHOW_LOGON) {
 				struct conversation *c = find_conversation(b->name);
 				if (c) {
@@ -1648,6 +1666,7 @@
 	pixmap = gtk_pixmap_new(pm, mask);
 	gtk_widget_show(pixmap);
 	gdk_pixmap_unref(pm);
+	gdk_bitmap_unref(mask);
 
 	gtk_box_pack_start(GTK_BOX(hbox), pixmap, FALSE, FALSE, 2);
 
--- a/src/conversation.c	Wed Aug 30 23:56:09 2000 +0000
+++ b/src/conversation.c	Thu Aug 31 00:25:25 2000 +0000
@@ -1293,56 +1293,69 @@
 	     &win->style->white, bold_xpm );
 	link_p = gtk_pixmap_new(link_i, mask);
 	gtk_widget_show(link_p);
+	gdk_bitmap_unref(mask);
 
 	palette_i = gdk_pixmap_create_from_xpm_d (win->window, &mask,
              &win->style->white, bold_xpm );
 	palette_p = gtk_pixmap_new(palette_i, mask);
 	gtk_widget_show(palette_p);
+	gdk_bitmap_unref(mask);
 
 	wood_i = gdk_pixmap_create_from_xpm_d ( win->window, &mask, 
 	     &win->style->white, wood_xpm );
 	wood_p = gtk_pixmap_new(wood_i, mask);
 	gtk_widget_show(wood_p);
+	gdk_bitmap_unref(mask);
 	speaker_i = gdk_pixmap_create_from_xpm_d ( win->window, &mask,
              &win->style->white, speaker_xpm );
 	speaker_p = gtk_pixmap_new(speaker_i, mask);
 	gtk_widget_show(speaker_p);
+	gdk_bitmap_unref(mask);
 	c->makesound=1;
 	strike_i = gdk_pixmap_create_from_xpm_d ( win->window, &mask,
 	     &win->style->white, strike_xpm );
 	strike_p = gtk_pixmap_new(strike_i, mask);
 	gtk_widget_show(strike_p);
+	gdk_bitmap_unref(mask);
 	bold_i = gdk_pixmap_create_from_xpm_d ( win->window, &mask,
              &win->style->white, bold_xpm );
 	bold_p = gtk_pixmap_new(bold_i, mask);
 	gtk_widget_show(bold_p);
+	gdk_bitmap_unref(mask);
 	italic_i = gdk_pixmap_create_from_xpm_d ( win->window, &mask,
              &win->style->white, italic_xpm );
 	italic_p = gtk_pixmap_new(italic_i, mask);
 	gtk_widget_show(italic_p);
+	gdk_bitmap_unref(mask);
 	underline_i = gdk_pixmap_create_from_xpm_d ( win->window, &mask,
 	     &win->style->white, underline_xpm );
 	underline_p = gtk_pixmap_new(underline_i, mask);
 	gtk_widget_show(underline_p);
+	gdk_bitmap_unref(mask);
 	small_i = gdk_pixmap_create_from_xpm_d ( win->window, &mask,
              &win->style->white, small_xpm );
 	small_p = gtk_pixmap_new(small_i, mask);
 	gtk_widget_show(small_p);
+	gdk_bitmap_unref(mask);
 	normal_i = gdk_pixmap_create_from_xpm_d ( win->window, &mask,
              &win->style->white, normal_xpm );
 	normal_p = gtk_pixmap_new(normal_i, mask);
 	gtk_widget_show(normal_p);
+	gdk_bitmap_unref(mask);
 	big_i = gdk_pixmap_create_from_xpm_d ( win->window, &mask,
              &win->style->white, big_xpm );
 	big_p = gtk_pixmap_new(big_i, mask);
 	gtk_widget_show(big_p);
+	gdk_bitmap_unref(mask);
 	font_i = gdk_pixmap_create_from_xpm_d ( win->window, &mask,
 			&win->style->white, bold_xpm );
 	font_p = gtk_pixmap_new(font_i, mask);
 	gtk_widget_show(font_p);
+	gdk_bitmap_unref(mask);
 	smiley_i = gdk_pixmap_create_from_xpm_d(win->window, &mask, &win->style->white, smile_icon_xpm);
 	smiley_p = gtk_pixmap_new(smiley_i, mask);
 	gtk_widget_show(smiley_p);
+	gdk_bitmap_unref(mask);
 
 	bold = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar),
 						GTK_TOOLBAR_CHILD_TOGGLEBUTTON, NULL,
--- a/src/dialogs.c	Wed Aug 30 23:56:09 2000 +0000
+++ b/src/dialogs.c	Thu Aug 31 00:25:25 2000 +0000
@@ -3054,6 +3054,7 @@
 	tpm = gtk_pixmap_new(dpm, mask);
 	gtk_widget_show(tpm);
 	gdk_pixmap_unref(dpm);
+	gdk_bitmap_unref(mask);
 	button = gtk_toolbar_append_element(GTK_TOOLBAR(bar), GTK_TOOLBAR_CHILD_BUTTON, NULL, NULL, NULL, NULL, tpm, GTK_SIGNAL_FUNC(set_smiley_array), (int *)face);
 	gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(insert_smiley_text), c);
 
--- a/src/util.c	Wed Aug 30 23:56:09 2000 +0000
+++ b/src/util.c	Thu Aug 31 00:25:25 2000 +0000
@@ -932,6 +932,7 @@
 /*	gtk_widget_set_usize(button, 75, 30);*/
 	gtk_widget_show(button);
 	gdk_pixmap_unref(pm);
+	gdk_bitmap_unref(mask);
 		
 	return button;
 }
@@ -973,6 +974,7 @@
 	gtk_widget_show(button_box);
 	gtk_widget_show(button);
 	gdk_pixmap_unref(pm);
+	gdk_bitmap_unref(mask);
 	
 	gtk_tooltips_set_tip(tips, button, text, "Gaim");	
 	return button;