5089N/A# date:2007-08-27 owner:elaine type:bug bugster:6595691 state:upstream

5089N/A# Bug 15418257 SUNBT6595691 gaim crash on startup when parsing the account

5089N/A#

5089N/A# These changes are already present upstream.

5089N/A

5089N/A--- pidgin-2.7.0/pidgin/pidginstock.c.orig 2010-05-13 15:32:57.823406906 +0800

5089N/A+++ pidgin-2.7.0/pidgin/pidginstock.c 2010-05-13 15:37:22.643337918 +0800

5089N/A@@ -277,6 +277,9 @@

5089N/A guchar *pixels;

5089N/A guchar a;

5089N/A

5089N/A+ if (!pixbuf)

5089N/A+ return;

5089N/A+

5089N/A if (!gdk_pixbuf_get_has_alpha(pixbuf))

5089N/A return;

5089N/A

5089N/A@@ -340,6 +343,10 @@

5089N/A filename = find_icon_file(theme, size, sized_icon, FALSE);

5089N/A g_return_if_fail(filename != NULL);

5089N/A pixbuf = gdk_pixbuf_new_from_file(filename, NULL);

5089N/A+

5089N/A+ if (!pixbuf)

5089N/A+ return;

5089N/A+

5089N/A if (translucent)

5089N/A do_alphashift(pixbuf);

5089N/A

5089N/A@@ -370,6 +377,10 @@

5089N/A filename = find_icon_file(theme, size, sized_icon, TRUE);

5089N/A g_return_if_fail(filename != NULL);

5089N/A pixbuf = gdk_pixbuf_new_from_file(filename, NULL);

5089N/A+

5089N/A+ if (!pixbuf)

5089N/A+ return;

5089N/A+

5089N/A if (translucent)

5089N/A do_alphashift(pixbuf);

5089N/A

5089N/A--- pidgin-2.7.0/pidgin/gtkblist.c.orig 2010-05-13 15:30:04.787201508 +0800

5089N/A+++ pidgin-2.7.0/pidgin/gtkblist.c 2010-05-13 15:32:20.466553418 +0800

5089N/A@@ -5547,11 +5547,14 @@

5089N/A g_object_ref_sink (tooltips);

5089N/A

5089N/A gtk_tooltips_force_window (tooltips);

5089N/A+ if (tooltips->tip_window)

5089N/A+ {

5089N/A #if GTK_CHECK_VERSION(2, 12, 0)

5089N/A- gtk_widget_set_name (tooltips->tip_window, "gtk-tooltips");

5089N/A+ gtk_widget_set_name (tooltips->tip_window, "gtk-tooltips");

5089N/A #endif

5089N/A- gtk_widget_ensure_style (tooltips->tip_window);

5089N/A- style = gtk_widget_get_style (tooltips->tip_window);

5089N/A+ gtk_widget_ensure_style (tooltips->tip_window);

5089N/A+ style = gtk_widget_get_style (tooltips->tip_window);

5089N/A+ }

5089N/A

5089N/A gtkblist->changing_style = TRUE;

5089N/A gtk_widget_set_style (gtkblist->headline_hbox, style);

5089N/A--- pidgin-2.7.0/libpurple/account.c.orig 2010-05-13 15:37:40.694159408 +0800

5089N/A+++ pidgin-2.7.0/libpurple/account.c 2010-05-13 15:38:29.948112474 +0800

5089N/A@@ -683,6 +683,9 @@

5089N/A xmlnode *child;

5089N/A char *data;

5089N/A

5089N/A+ if (!node)

5089N/A+ return;

5089N/A+

5089N/A proxy_info = purple_proxy_info_new();

5089N/A

5089N/A /* Use the global proxy settings, by default */