pidgin-commits

[Gaim-commits] SF.net SVN: gaim: [16933] trunk/gtk/gtkaccount.c

[<the...@us...>]

Revision: 16933
Author:   thekingant
Date:     2006-08-20 19:49:42 -0700 (Sun, 20 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16933&view=rev

Log Message:
-----------
Don't do icon stuff if the protocol doesn't support icons.
Most of this is indentation changes.

Modified Paths:
--------------
    trunk/gtk/gtkaccount.c
Modified: trunk/gtk/gtkaccount.c
===================================================================
--- trunk/gtk/gtkaccount.c	2006-08-21 02:42:14 UTC (rev 16932)
+++ trunk/gtk/gtkaccount.c	2006-08-21 02:49:42 UTC (rev 16933)
@@ -1095,6 +1095,7 @@
 	char *tmp;
 	gboolean new = FALSE, icon_change = FALSE;
 	GaimAccount *account;
+	GaimPluginProtocolInfo *prpl_info;
 
 	if (dialog->account == NULL)
 	{
@@ -1121,21 +1122,29 @@
 		gaim_account_set_alias(account, NULL);
 
 	/* Buddy Icon */
-	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;
+	prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(dialog->plugin);
+	if ((prpl_info != NULL) && (prpl_info->options & OPT_PROTO_IM_IMAGE))
+	{
+		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;
+		}
+		gaim_account_set_ui_bool(account, GAIM_GTK_UI, "use-global-buddyicon", !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dialog->icon_check)));
+		gaim_account_set_ui_string(account, GAIM_GTK_UI, "non-global-buddyicon", dialog->icon_path);
+		if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dialog->icon_check)))
+		{
+			gaim_account_set_buddy_icon(account, dialog->icon_path);
+		}
+		else if (gaim_prefs_get_string("/gaim/gtk/accounts/buddyicon") && icon_change)
+		{
+			char *icon = gaim_gtk_convert_buddy_icon(dialog->plugin, gaim_prefs_get_string("/gaim/gtk/accounts/buddyicon"));
+			gaim_account_set_buddy_icon(account, icon);
+			g_free(icon);
+		}
 	}
-	gaim_account_set_ui_bool(account, GAIM_GTK_UI, "use-global-buddyicon", !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dialog->icon_check)));
-	gaim_account_set_ui_string(account, GAIM_GTK_UI, "non-global-buddyicon", dialog->icon_path);
-	if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dialog->icon_check))) {
-		gaim_account_set_buddy_icon(account, dialog->icon_path);
-	} else if (gaim_prefs_get_string("/gaim/gtk/accounts/buddyicon") && icon_change) {
-		char *icon = gaim_gtk_convert_buddy_icon(dialog->plugin, gaim_prefs_get_string("/gaim/gtk/accounts/buddyicon"));
-		gaim_account_set_buddy_icon(account, icon);
-		g_free(icon);
-	}
-		
 
+
 	/* Remember Password */
 	gaim_account_set_remember_password(account,
 			gtk_toggle_button_get_active(


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17286] trunk/gtk/gtkaccount.c

[<sa...@us...>]

Revision: 17286
          http://svn.sourceforge.net/gaim/?rev=17286&view=rev
Author:   sadrul
Date:     2006-09-15 20:29:21 -0700 (Fri, 15 Sep 2006)

Log Message:
-----------
Whether the prpl supports sending inline images or not is not relevant here.

Modified Paths:
--------------
    trunk/gtk/gtkaccount.c

Modified: trunk/gtk/gtkaccount.c
===================================================================
--- trunk/gtk/gtkaccount.c	2006-09-16 00:56:13 UTC (rev 17285)
+++ trunk/gtk/gtkaccount.c	2006-09-16 03:29:21 UTC (rev 17286)
@@ -1123,7 +1123,7 @@
 
 	/* Buddy Icon */
 	prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(dialog->plugin);
-	if ((prpl_info != NULL) && (prpl_info->options & OPT_PROTO_IM_IMAGE))
+	if (prpl_info != NULL && prpl_info->icon_spec.format != NULL)
 	{
 		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)))


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17336] trunk/gtk/gtkaccount.c

[<the...@us...>]

Revision: 17336
          http://svn.sourceforge.net/gaim/?rev=17336&view=rev
Author:   thekingant
Date:     2006-09-21 23:21:00 -0700 (Thu, 21 Sep 2006)

Log Message:
-----------
Get rid of a call to printf

Modified Paths:
--------------
    trunk/gtk/gtkaccount.c

Modified: trunk/gtk/gtkaccount.c
===================================================================
--- trunk/gtk/gtkaccount.c	2006-09-22 05:42:01 UTC (rev 17335)
+++ trunk/gtk/gtkaccount.c	2006-09-22 06:21:00 UTC (rev 17336)
@@ -607,7 +607,7 @@
 	if (dialog->account != NULL) {
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dialog->new_mail_check),
 					     gaim_account_get_check_mail(dialog->account));
-		
+
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dialog->icon_check),
 					     !gaim_account_get_ui_bool(dialog->account, GAIM_GTK_UI, "use-global-buddyicon",
 								       TRUE));
@@ -1063,7 +1063,6 @@
 			/* The user set an icon, which would've been cached by convert_buddy_icon,
 			 * but didn't save the changes. Delete the cache file. */
 			char *filename = g_build_filename(gaim_buddy_icons_get_cache_dir(), dialog->icon_path, NULL);
-			printf("Deleting\n");
 			g_unlink(filename);
 			g_free(filename);
 		}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17337] trunk/gtk/gtkaccount.c

[<the...@us...>]

Revision: 17337
          http://svn.sourceforge.net/gaim/?rev=17337&view=rev
Author:   thekingant
Date:     2006-09-21 23:45:01 -0700 (Thu, 21 Sep 2006)

Log Message:
-----------
Show the placeholder icon in the account editor.  I didn't make it
clickable, though.  Can someone please do that for me?  Pretty please
with corn syrup on top?  I'll be your best friend!

Modified Paths:
--------------
    trunk/gtk/gtkaccount.c

Modified: trunk/gtk/gtkaccount.c
===================================================================
--- trunk/gtk/gtkaccount.c	2006-09-22 06:21:00 UTC (rev 17336)
+++ trunk/gtk/gtkaccount.c	2006-09-22 06:45:01 UTC (rev 17337)
@@ -189,16 +189,24 @@
 }
 
 static void
-set_dialog_icon(AccountPrefsDialog *dialog)
+set_dialog_icon(AccountPrefsDialog *dialog, gchar *new_icon_path)
 {
-	char *filename = gaim_buddy_icons_get_full_path(dialog->icon_path);
+	char *filename;
 	GdkPixbuf *pixbuf = NULL;
-	if (filename)
+
+	g_free(dialog->icon_path);
+	dialog->icon_path = new_icon_path;
+
+	filename = gaim_buddy_icons_get_full_path(dialog->icon_path);
+	if (filename != NULL) {
 		pixbuf = gdk_pixbuf_new_from_file(filename, NULL);
+		g_free(filename);
+	}
 
 	if (pixbuf && dialog->prpl_info &&
 	    (dialog->prpl_info->icon_spec.scale_rules & GAIM_ICON_SCALE_DISPLAY))
 	{
+		/* Scale the icon to something reasonable */
 		int width, height;
 		GdkPixbuf *scale;
 
@@ -210,10 +218,19 @@
 		pixbuf = scale;
 	}
 
+	if (pixbuf == NULL)
+	{
+		/* Show a placeholder icon */
+		gchar *filename;
+		filename = g_build_filename(DATADIR, "pixmaps",
+				"gaim", "insert-image.png", NULL);
+		pixbuf = gdk_pixbuf_new_from_file(filename, NULL);
+		g_free(filename);
+	}
+
 	gtk_image_set_from_pixbuf(GTK_IMAGE(dialog->icon_entry), pixbuf);
 	if (pixbuf != NULL)
 		g_object_unref(G_OBJECT(pixbuf));
-	g_free(filename);
 }
 
 static void
@@ -279,12 +296,7 @@
 
 	dialog = data;
 
-	if (filename) {
-		g_free(dialog->icon_path);
-		dialog->icon_path = gaim_gtk_convert_buddy_icon(dialog->plugin, filename);
-		set_dialog_icon(dialog);
-		gtk_widget_show(dialog->icon_entry);
-	}
+	set_dialog_icon(dialog, gaim_gtk_convert_buddy_icon(dialog->plugin, filename));
 
 	dialog->icon_filesel = NULL;
 }
@@ -299,13 +311,9 @@
 static void
 icon_reset_cb(GtkWidget *button, AccountPrefsDialog *dialog)
 {
-	g_free(dialog->icon_path);
-	dialog->icon_path = NULL;
-
-	gtk_widget_hide(dialog->icon_entry);
+	set_dialog_icon(dialog, NULL);
 }
 
-
 static void
 account_dnd_recv(GtkWidget *widget, GdkDragContext *dc, gint x, gint y,
 		 GtkSelectionData *sd, guint info, guint t, AccountPrefsDialog *dialog)
@@ -328,11 +336,7 @@
 			}
 			if ((rtmp = strchr(tmp, '\r')) || (rtmp = strchr(tmp, '\n')))
 				*rtmp = '\0';
-			g_free(dialog->icon_path);
-
-			dialog->icon_path = gaim_gtk_convert_buddy_icon(dialog->plugin, tmp);
-			set_dialog_icon(dialog);
-			gtk_widget_show(dialog->icon_entry);
+			set_dialog_icon(dialog, gaim_gtk_convert_buddy_icon(dialog->plugin, tmp));
 			g_free(tmp);
 		}
 		gtk_drag_finish(dc, TRUE, FALSE, t);
@@ -612,8 +616,9 @@
 					     !gaim_account_get_ui_bool(dialog->account, GAIM_GTK_UI, "use-global-buddyicon",
 								       TRUE));
 
-		dialog->icon_path = g_strdup(gaim_account_get_ui_string(dialog->account, GAIM_GTK_UI, "non-global-buddyicon", NULL));
-		set_dialog_icon(dialog);
+		set_dialog_icon(dialog,
+				g_strdup(gaim_account_get_ui_string(dialog->account,
+						GAIM_GTK_UI, "non-global-buddyicon", NULL)));
 	}
 
 	if (!dialog->prpl_info ||


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17454] trunk/gtk/gtkaccount.c

[<the...@us...>]

Revision: 17454
          http://svn.sourceforge.net/gaim/?rev=17454&view=rev
Author:   thekingant
Date:     2006-10-10 01:14:57 -0700 (Tue, 10 Oct 2006)

Log Message:
-----------
Make the buddy icon button in modify account windows clickable and
get rid of the modify button

Modified Paths:
--------------
    trunk/gtk/gtkaccount.c

Modified: trunk/gtk/gtkaccount.c
===================================================================
--- trunk/gtk/gtkaccount.c	2006-10-10 00:45:14 UTC (rev 17453)
+++ trunk/gtk/gtkaccount.c	2006-10-10 08:14:57 UTC (rev 17454)
@@ -573,10 +573,16 @@
 	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
 	gtk_widget_show(label);
 
+	button = gtk_button_new();
+	gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
+	gtk_widget_show(button);
+	g_signal_connect(G_OBJECT(button), "clicked",
+	                 G_CALLBACK(icon_select_cb), dialog);
+
 	dialog->icon_entry = gtk_image_new();
-	gtk_box_pack_start(GTK_BOX(hbox), dialog->icon_entry,
-					   FALSE, FALSE, 0);
+	gtk_container_add(GTK_CONTAINER(button), dialog->icon_entry);
 	gtk_widget_show(dialog->icon_entry);
+	/* TODO: Uh, isn't this next line pretty useless? */
 	gaim_set_accessible_label (dialog->icon_entry, label);
 	dialog->icon_path = NULL;
 
@@ -588,12 +594,6 @@
 	gtk_box_pack_start(GTK_BOX(vbox2), hbox2, FALSE, FALSE, GAIM_HIG_BORDER);
 	gtk_widget_show(hbox2);
 
-	button = gtk_button_new_from_stock(GTK_STOCK_OPEN);
-	gtk_box_pack_start(GTK_BOX(hbox2), button, FALSE, FALSE, 0);
-	g_signal_connect(G_OBJECT(button), "clicked",
-					 G_CALLBACK(icon_select_cb), dialog);
-	gtk_widget_show(button);
-
 	button = gtk_button_new_from_stock(GTK_STOCK_REMOVE);
 	g_signal_connect(G_OBJECT(button), "clicked",
 			 G_CALLBACK(icon_reset_cb), dialog);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17455] trunk/gtk/gtkaccount.c

[<the...@us...>]

Revision: 17455
          http://svn.sourceforge.net/gaim/?rev=17455&view=rev
Author:   thekingant
Date:     2006-10-10 01:19:45 -0700 (Tue, 10 Oct 2006)

Log Message:
-----------
Don't try to do stuff if the user cancels out of the buddy icon selection
dialog in the account editor.  This gets rid of an assertion failure.

Modified Paths:
--------------
    trunk/gtk/gtkaccount.c

Modified: trunk/gtk/gtkaccount.c
===================================================================
--- trunk/gtk/gtkaccount.c	2006-10-10 08:14:57 UTC (rev 17454)
+++ trunk/gtk/gtkaccount.c	2006-10-10 08:19:45 UTC (rev 17455)
@@ -296,7 +296,8 @@
 
 	dialog = data;
 
-	set_dialog_icon(dialog, gaim_gtk_convert_buddy_icon(dialog->plugin, filename));
+	if (filename != NULL)
+		set_dialog_icon(dialog, gaim_gtk_convert_buddy_icon(dialog->plugin, filename));
 
 	dialog->icon_filesel = NULL;
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17628] trunk/gtk/gtkaccount.c

[<the...@us...>]

Revision: 17628
          http://svn.sourceforge.net/gaim/?rev=17628&view=rev
Author:   thekingant
Date:     2006-10-29 21:09:28 -0800 (Sun, 29 Oct 2006)

Log Message:
-----------
A documentation patch from Eduardo P?\195?\169rez to clean up a little bit of code.

Modified Paths:
--------------
    trunk/gtk/gtkaccount.c

Modified: trunk/gtk/gtkaccount.c
===================================================================
--- trunk/gtk/gtkaccount.c	2006-10-30 04:45:06 UTC (rev 17627)
+++ trunk/gtk/gtkaccount.c	2006-10-30 05:09:28 UTC (rev 17628)
@@ -2056,9 +2056,13 @@
 
 	/* Create the list model. */
 	dialog->model = gtk_list_store_new(NUM_COLUMNS,
-									   GDK_TYPE_PIXBUF, G_TYPE_STRING,
-									   G_TYPE_BOOLEAN, G_TYPE_STRING, G_TYPE_POINTER,
-									   G_TYPE_POINTER);
+					GDK_TYPE_PIXBUF,   /* COLUMN_ICON */
+					G_TYPE_STRING,     /* COLUMN_SCREENNAME */
+					G_TYPE_BOOLEAN,    /* COLUMN_ENABLED */
+					G_TYPE_STRING,     /* COLUMN_PROTOCOL */
+					G_TYPE_POINTER,    /* COLUMN_DATA */
+					G_TYPE_POINTER     /* COLUMN_PULSE_DATA */
+					);
 
 	/* And now the actual treeview */
 	treeview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(dialog->model));


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17770] trunk/gtk/gtkaccount.c

[<sea...@us...>]

Revision: 17770
          http://svn.sourceforge.net/gaim/?rev=17770&view=rev
Author:   seanegan
Date:     2006-11-17 13:03:44 -0800 (Fri, 17 Nov 2006)

Log Message:
-----------
gaim-devel suggested a 'wizard' of sorts for first-time users. This is as wizardish as I'm willing to get :)

Modified Paths:
--------------
    trunk/gtk/gtkaccount.c

Modified: trunk/gtk/gtkaccount.c
===================================================================
--- trunk/gtk/gtkaccount.c	2006-11-17 19:39:17 UTC (rev 17769)
+++ trunk/gtk/gtkaccount.c	2006-11-17 21:03:44 UTC (rev 17770)
@@ -72,6 +72,7 @@
 
 	GtkWidget *modify_button;
 	GtkWidget *delete_button;
+	GtkWidget *notebook;
 
 	GtkListStore *model;
 	GtkTreeIter drag_iter;
@@ -1601,6 +1602,9 @@
 	/* Remove the account from the GtkListStore */
 	if (accounts_window_find_account_in_treemodel(&iter, account))
 		gtk_list_store_remove(accounts_window->model, &iter);
+	
+	if (gaim_accounts_get_all() == NULL)
+		gtk_notebook_set_current_page(GTK_NOTEBOOK(accounts_window->notebook), 0);
 }
 
 static void
@@ -1969,19 +1973,25 @@
 		return;
 
 	gtk_list_store_append(accounts_window->model, &iter);
+	gtk_notebook_set_current_page(GTK_NOTEBOOK(accounts_window->notebook),1);
 
 	set_account(accounts_window->model, &iter, account);
 }
 
-static void
+static gboolean
 populate_accounts_list(AccountsWindow *dialog)
 {
 	GList *l;
-
+	gboolean ret = FALSE;
+	
 	gtk_list_store_clear(dialog->model);
 
-	for (l = gaim_accounts_get_all(); l != NULL; l = l->next)
+	for (l = gaim_accounts_get_all(); l != NULL; l = l->next) {
+		ret = TRUE;
 		add_account_to_liststore((GaimAccount *)l->data, NULL);
+	}
+
+	return ret;
 }
 
 #if !GTK_CHECK_VERSION(2,2,0)
@@ -2045,18 +2055,50 @@
 static GtkWidget *
 create_accounts_list(AccountsWindow *dialog)
 {
+	GtkWidget *frame;
 	GtkWidget *sw;
+	GtkWidget *label;
 	GtkWidget *treeview;
+	GdkColor color;
 	GtkTreeSelection *sel;
 	GtkTargetEntry gte[] = {{"GAIM_ACCOUNT", GTK_TARGET_SAME_APP, 0}};
 
+	frame = gtk_frame_new(NULL);
+	gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN);
+
+	accounts_window->notebook = gtk_notebook_new();
+	gtk_notebook_set_show_tabs(GTK_NOTEBOOK(accounts_window->notebook), FALSE);
+	gtk_notebook_set_show_border(GTK_NOTEBOOK(accounts_window->notebook), FALSE);
+	gtk_container_add(GTK_CONTAINER(frame), accounts_window->notebook);
+
+       	
+	/* Create a helpful first-time-use label */
+       	label = gtk_label_new(NULL);
+	gtk_label_set_markup(GTK_LABEL(label), _(
+						 "<span size='larger' weight='bold'>Welcome to Gaim!</span>\n\n"
+						 
+						 "You have no IM accounts configured. To start connecting with Gaim "
+						 "press the <b>Add</b> button below and configure your first "
+						 "account. If you want Gaim to connect to multiple IM accounts, "
+						 "press <b>Add</b> again to configure them all.\n\n"
+						 
+						 "You can come back to this window to add, edit, or remove "
+						 "accounts from <b>Accounts \342\207\250 Add/Edit</b> in the Buddy "
+						 "List window"));
+	gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
+	gtk_widget_show(label);
+
+	gtk_misc_set_alignment(GTK_MISC(label), 0.5, 0.5);
+	gtk_notebook_append_page(GTK_NOTEBOOK(accounts_window->notebook), label, NULL);
+
 	/* Create the scrolled window. */
 	sw = gtk_scrolled_window_new(0, 0);
 	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
 					GTK_POLICY_AUTOMATIC,
 					GTK_POLICY_AUTOMATIC);
 	gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw),
-					GTK_SHADOW_IN);
+					GTK_SHADOW_NONE);
+	gtk_notebook_append_page(GTK_NOTEBOOK(accounts_window->notebook), sw, NULL);
 	gtk_widget_show(sw);
 
 	/* Create the list model. */
@@ -2084,11 +2126,13 @@
 					 G_CALLBACK(account_treeview_double_click_cb), dialog);
 
 	gtk_container_add(GTK_CONTAINER(sw), treeview);
-	gtk_widget_show(treeview);
 
 	add_columns(treeview, dialog);
 
-	populate_accounts_list(dialog);
+	if (populate_accounts_list(dialog))
+		gtk_notebook_set_current_page(GTK_NOTEBOOK(accounts_window->notebook), 1);
+	else 
+		gtk_notebook_set_current_page(GTK_NOTEBOOK(accounts_window->notebook), 0);
 
 	/* Setup DND. I wanna be an orc! */
 	gtk_tree_view_enable_model_drag_source(
@@ -2102,8 +2146,9 @@
 					 G_CALLBACK(drag_data_received_cb), dialog);
 	g_signal_connect(G_OBJECT(treeview), "drag-data-get",
 					 G_CALLBACK(drag_data_get_cb), dialog);
-
-	return sw;
+	
+	gtk_widget_show_all(frame);
+	return frame;
 }
 
 static void


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17771] trunk/gtk/gtkaccount.c

[<sea...@us...>]

Revision: 17771
          http://svn.sourceforge.net/gaim/?rev=17771&view=rev
Author:   seanegan
Date:     2006-11-17 13:54:46 -0800 (Fri, 17 Nov 2006)

Log Message:
-----------
warning fix

Modified Paths:
--------------
    trunk/gtk/gtkaccount.c

Modified: trunk/gtk/gtkaccount.c
===================================================================
--- trunk/gtk/gtkaccount.c	2006-11-17 21:03:44 UTC (rev 17770)
+++ trunk/gtk/gtkaccount.c	2006-11-17 21:54:46 UTC (rev 17771)
@@ -2059,7 +2059,6 @@
 	GtkWidget *sw;
 	GtkWidget *label;
 	GtkWidget *treeview;
-	GdkColor color;
 	GtkTreeSelection *sel;
 	GtkTargetEntry gte[] = {{"GAIM_ACCOUNT", GTK_TARGET_SAME_APP, 0}};
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17800] trunk/gtk/gtkaccount.c

[<dat...@us...>]

Revision: 17800
          http://svn.sourceforge.net/gaim/?rev=17800&view=rev
Author:   datallah
Date:     2006-11-20 21:32:55 -0800 (Mon, 20 Nov 2006)

Log Message:
-----------
We shouldn't be freeing kvp->value, which is put in the list store as G_TYPE_POINTER.
This was causing crashes for people editing SILC accounts (nothing else uses GAIM_PREF_STRING_LIST).

Modified Paths:
--------------
    trunk/gtk/gtkaccount.c

Modified: trunk/gtk/gtkaccount.c
===================================================================
--- trunk/gtk/gtkaccount.c	2006-11-21 04:34:38 UTC (rev 17799)
+++ trunk/gtk/gtkaccount.c	2006-11-21 05:32:55 UTC (rev 17800)
@@ -810,7 +810,7 @@
 					if (node->data != NULL) {
 						kvp = (GaimKeyValuePair *) node->data;
 						if ((kvp->value != NULL) && (str_value != NULL) &&
-							!g_utf8_collate(kvp->value, str_value))
+						    !g_utf8_collate(kvp->value, str_value))
 							idx = i;
 
 						gtk_list_store_append(model, &iter);
@@ -1247,7 +1247,6 @@
 					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, &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.

[Gaim-commits] SF.net SVN: gaim: [17821] trunk/gtk/gtkaccount.c

[<sa...@us...>]

Revision: 17821
          http://svn.sourceforge.net/gaim/?rev=17821&view=rev
Author:   sadrul
Date:     2006-11-26 11:49:14 -0800 (Sun, 26 Nov 2006)

Log Message:
-----------
Show the placeholder icon in the accounts window for new accounts.

Modified Paths:
--------------
    trunk/gtk/gtkaccount.c

Modified: trunk/gtk/gtkaccount.c
===================================================================
--- trunk/gtk/gtkaccount.c	2006-11-26 17:25:08 UTC (rev 17820)
+++ trunk/gtk/gtkaccount.c	2006-11-26 19:49:14 UTC (rev 17821)
@@ -617,12 +617,12 @@
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dialog->icon_check),
 					     !gaim_account_get_ui_bool(dialog->account, GAIM_GTK_UI, "use-global-buddyicon",
 								       TRUE));
-
-		set_dialog_icon(dialog,
-				g_strdup(gaim_account_get_ui_string(dialog->account,
-						GAIM_GTK_UI, "non-global-buddyicon", NULL)));
 	}
 
+	set_dialog_icon(dialog, dialog->account ?
+			g_strdup(gaim_account_get_ui_string(dialog->account,
+					GAIM_GTK_UI, "non-global-buddyicon", NULL)) : NULL);
+
 	if (!dialog->prpl_info ||
 			(!(dialog->prpl_info->options & OPT_PROTO_MAIL_CHECK) &&
 			 (dialog->prpl_info->icon_spec.format ==  NULL))) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17863] trunk/gtk/gtkaccount.c

[<the...@us...>]

Revision: 17863
          http://svn.sourceforge.net/gaim/?rev=17863&view=rev
Author:   thekingant
Date:     2006-11-30 20:38:54 -0800 (Thu, 30 Nov 2006)

Log Message:
-----------
Surely this is what was intended?  Get rid of an assertion
failure when adding a new account.

Modified Paths:
--------------
    trunk/gtk/gtkaccount.c

Modified: trunk/gtk/gtkaccount.c
===================================================================
--- trunk/gtk/gtkaccount.c	2006-12-01 04:27:36 UTC (rev 17862)
+++ trunk/gtk/gtkaccount.c	2006-12-01 04:38:54 UTC (rev 17863)
@@ -1155,7 +1155,7 @@
 		else if (gaim_prefs_get_string("/gaim/gtk/accounts/buddyicon") && icon_change)
 		{
 			const char *filename = gaim_prefs_get_string("/gaim/gtk/accounts/buddyicon");
-			char *icon = gaim_gtk_convert_buddy_icon(dialog->plugin, gaim_prefs_get_string(filename));
+			char *icon = gaim_gtk_convert_buddy_icon(dialog->plugin, filename);
 			gaim_account_set_buddy_icon_path(account, filename);
 			gaim_account_set_buddy_icon(account, icon);
 			g_free(icon);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17888] trunk/gtk/gtkaccount.c

[<fac...@us...>]

Revision: 17888
          http://svn.sourceforge.net/gaim/?rev=17888&view=rev
Author:   faceprint
Date:     2006-12-03 19:44:42 -0800 (Sun, 03 Dec 2006)

Log Message:
-----------
this is hackish, but works.  Fixes 1549152.

Modified Paths:
--------------
    trunk/gtk/gtkaccount.c

Modified: trunk/gtk/gtkaccount.c
===================================================================
--- trunk/gtk/gtkaccount.c	2006-12-04 02:12:53 UTC (rev 17887)
+++ trunk/gtk/gtkaccount.c	2006-12-04 03:44:42 UTC (rev 17888)
@@ -136,6 +136,9 @@
 	GtkWidget *proxy_user_entry;
 	GtkWidget *proxy_pass_entry;
 
+	/* Are we registering? */
+	gboolean   registering;
+
 } AccountPrefsDialog;
 
 typedef struct
@@ -1335,7 +1338,7 @@
 		gaim_signal_emit(gaim_gtk_account_get_handle(), "account-modified", account);
 
 	/* If this is a new account, then sign on! */
-	if (new) {
+	if (new && !dialog->registering) {
 		const GaimSavedStatus *saved_status;
 
 		saved_status = gaim_savedstatus_get_current();
@@ -1351,8 +1354,12 @@
 static void
 register_account_prefs_cb(GtkWidget *w, AccountPrefsDialog *dialog)
 {
-	GaimAccount *account = ok_account_prefs_cb(NULL, dialog);
+	GaimAccount *account;
 
+	dialog->registering = TRUE;
+
+	account = ok_account_prefs_cb(NULL, dialog);
+
 	gaim_account_register(account);
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.