From: <nos...@us...> - 2006-04-15 15:01:37
|
Revision: 16037 Author: nosnilmot Date: 2006-04-15 08:01:30 -0700 (Sat, 15 Apr 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16037&view=rev Log Message: ----------- Fix Coverity CID 105 and plug a small leak Modified Paths: -------------- trunk/src/gtkaccount.c Modified: trunk/src/gtkaccount.c =================================================================== --- trunk/src/gtkaccount.c 2006-04-15 14:53:51 UTC (rev 16036) +++ trunk/src/gtkaccount.c 2006-04-15 15:01:30 UTC (rev 16037) @@ -1559,6 +1559,7 @@ GtkWidget *widget = l2->data; GtkTreeIter iter; const char *setting; + char *value2; int int_value; gboolean bool_value; @@ -1585,8 +1586,9 @@ case GAIM_PREF_STRING_LIST: gtk_combo_box_get_active_iter(GTK_COMBO_BOX(widget), &iter); - gtk_tree_model_get(gtk_combo_box_get_model(GTK_COMBO_BOX(widget)), &iter, 1, &value, -1); - gaim_account_set_string(dialog->account, setting, value); + gtk_tree_model_get(gtk_combo_box_get_model(GTK_COMBO_BOX(widget)), &iter, 1, &value2, -1); + gaim_account_set_string(account, setting, value2); + g_free(value2); break; default: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <the...@us...> - 2006-07-23 18:59:02
|
Revision: 16550 Author: thekingant Date: 2006-07-23 11:58:59 -0700 (Sun, 23 Jul 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16550&view=rev Log Message: ----------- Only set an account's status to the default status when enabling it, not when disabling it. Fixes a very minor weirdness. Modified Paths: -------------- trunk/src/gtkaccount.c Modified: trunk/src/gtkaccount.c =================================================================== --- trunk/src/gtkaccount.c 2006-07-23 18:57:28 UTC (rev 16549) +++ trunk/src/gtkaccount.c 2006-07-23 18:58:59 UTC (rev 16550) @@ -2221,9 +2221,15 @@ COLUMN_ENABLED, &enabled, -1); - /* Set the statuses for this account to the current status */ - saved_status = gaim_savedstatus_get_current(); - gaim_savedstatus_activate_for_account(saved_status, account); + /* + * If we just enabled the account, then set the statuses + * to the current status. + */ + if (!enabled) + { + saved_status = gaim_savedstatus_get_current(); + gaim_savedstatus_activate_for_account(saved_status, account); + } gaim_account_set_enabled(account, GAIM_GTK_UI, !enabled); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <the...@us...> - 2006-08-03 07:57:54
|
Revision: 16624 Author: thekingant Date: 2006-08-03 00:57:52 -0700 (Thu, 03 Aug 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16624&view=rev Log Message: ----------- Change "Alias:" to "Local alias:" in the account editor to hopefully avoid minor confusion Modified Paths: -------------- trunk/src/gtkaccount.c Modified: trunk/src/gtkaccount.c =================================================================== --- trunk/src/gtkaccount.c 2006-08-03 07:26:47 UTC (rev 16623) +++ trunk/src/gtkaccount.c 2006-08-03 07:57:52 UTC (rev 16624) @@ -860,7 +860,7 @@ /* Alias */ dialog->alias_entry = gtk_entry_new(); - add_pref_box(dialog, vbox, _("Alias:"), dialog->alias_entry); + add_pref_box(dialog, vbox, _("Local alias:"), dialog->alias_entry); /* Remember Password */ dialog->remember_pass_check = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <the...@us...> - 2006-08-12 10:06:22
|
Revision: 16711 Author: thekingant Date: 2006-08-12 03:06:15 -0700 (Sat, 12 Aug 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16711&view=rev Log Message: ----------- Get rid of an assert when editing an account that has no icon Modified Paths: -------------- trunk/src/gtkaccount.c Modified: trunk/src/gtkaccount.c =================================================================== --- trunk/src/gtkaccount.c 2006-08-11 19:56:55 UTC (rev 16710) +++ trunk/src/gtkaccount.c 2006-08-12 10:06:15 UTC (rev 16711) @@ -210,7 +210,8 @@ } gtk_image_set_from_pixbuf(GTK_IMAGE(dialog->icon_entry), pixbuf); - g_object_unref(G_OBJECT(pixbuf)); + if (pixbuf != NULL) + g_object_unref(G_OBJECT(pixbuf)); g_free(filename); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dat...@us...> - 2006-08-17 02:40:54
|
Revision: 16804 Author: datallah Date: 2006-08-16 19:40:44 -0700 (Wed, 16 Aug 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16804&view=rev Log Message: ----------- Sadrul fixed this buglet which prevented the global buddy icon from being applied to new accounts Modified Paths: -------------- trunk/src/gtkaccount.c Modified: trunk/src/gtkaccount.c =================================================================== --- trunk/src/gtkaccount.c 2006-08-17 02:20:56 UTC (rev 16803) +++ trunk/src/gtkaccount.c 2006-08-17 02:40:44 UTC (rev 16804) @@ -1119,7 +1119,7 @@ gaim_account_set_alias(account, NULL); /* Buddy Icon */ - if (gaim_account_get_ui_bool(account, GAIM_GTK_UI, "use-global-buddyicon", TRUE) == + if (new || gaim_account_get_ui_bool(account, GAIM_GTK_UI, "use-global-buddyicon", TRUE) == gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dialog->icon_check))) { icon_change = TRUE; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sa...@us...> - 2006-08-18 00:23:46
|
Revision: 16823 Author: sadrul Date: 2006-08-17 17:23:39 -0700 (Thu, 17 Aug 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16823&view=rev Log Message: ----------- Patch #1541744 ("Memleak"): "This plugs a possible memleak." The memleak would happen if you switch from an account with account-options to an account with none. Modified Paths: -------------- trunk/src/gtkaccount.c Modified: trunk/src/gtkaccount.c =================================================================== --- trunk/src/gtkaccount.c 2006-08-18 00:19:18 UTC (rev 16822) +++ trunk/src/gtkaccount.c 2006-08-18 00:23:39 UTC (rev 16823) @@ -646,6 +646,11 @@ dialog->protocol_frame = NULL; } + if (dialog->protocol_opt_entries != NULL) { + g_list_free(dialog->protocol_opt_entries); + dialog->protocol_opt_entries = NULL; + } + if (dialog->prpl_info == NULL || dialog->prpl_info->protocol_options == NULL) { @@ -669,11 +674,6 @@ gtk_container_add(GTK_CONTAINER(frame), vbox); gtk_widget_show(vbox); - if (dialog->protocol_opt_entries != NULL) { - g_list_free(dialog->protocol_opt_entries); - dialog->protocol_opt_entries = NULL; - } - for (l = dialog->prpl_info->protocol_options; l != NULL; l = l->next) { option = (GaimAccountOption *)l->data; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dat...@us...> - 2006-08-18 22:26:15
|
Revision: 16849 Author: datallah Date: 2006-08-18 15:26:09 -0700 (Fri, 18 Aug 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16849&view=rev Log Message: ----------- Fix assert editing an account w/o a buddy icon specified. Modified Paths: -------------- trunk/src/gtkaccount.c Modified: trunk/src/gtkaccount.c =================================================================== --- trunk/src/gtkaccount.c 2006-08-18 20:11:51 UTC (rev 16848) +++ trunk/src/gtkaccount.c 2006-08-18 22:26:09 UTC (rev 16849) @@ -192,7 +192,9 @@ set_dialog_icon(AccountPrefsDialog *dialog) { char *filename = gaim_buddy_icons_get_full_path(dialog->icon_path); - GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file(filename, NULL); + GdkPixbuf *pixbuf = NULL; + if (filename) + gdk_pixbuf_new_from_file(filename, NULL); if (pixbuf && dialog->prpl_info && (dialog->prpl_info->icon_spec.scale_rules & GAIM_ICON_SCALE_DISPLAY)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dat...@us...> - 2006-08-18 22:41:50
|
Revision: 16850 Author: datallah Date: 2006-08-18 15:41:44 -0700 (Fri, 18 Aug 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16850&view=rev Log Message: ----------- ... and also actually load the icon Modified Paths: -------------- trunk/src/gtkaccount.c Modified: trunk/src/gtkaccount.c =================================================================== --- trunk/src/gtkaccount.c 2006-08-18 22:26:09 UTC (rev 16849) +++ trunk/src/gtkaccount.c 2006-08-18 22:41:44 UTC (rev 16850) @@ -194,7 +194,7 @@ char *filename = gaim_buddy_icons_get_full_path(dialog->icon_path); GdkPixbuf *pixbuf = NULL; if (filename) - gdk_pixbuf_new_from_file(filename, NULL); + pixbuf = gdk_pixbuf_new_from_file(filename, NULL); if (pixbuf && dialog->prpl_info && (dialog->prpl_info->icon_spec.scale_rules & GAIM_ICON_SCALE_DISPLAY)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |