Mercurial > pidgin.yaz

changeset 8555:e0535ba0d667

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 9298] finally get to clean my tree out some committer: Tailor Script <tailor@pidgin.im>
author Nathan Walp <nwalp@pidgin.im>
date Fri, 02 Apr 2004 03:25:48 +0000
parents 5c3542e63997
children 267050247da9
files VERSION configure.ac plugins/gestures/stroke-draw.c src/gtkaccount.c
diffstat 4 files changed, 79 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/VERSION	Fri Apr 02 02:28:38 2004 +0000
+++ b/VERSION	Fri Apr 02 03:25:48 2004 +0000
@@ -1,1 +1,1 @@
-0.76
+0.77cvs
--- a/configure.ac	Fri Apr 02 02:28:38 2004 +0000
+++ b/configure.ac	Fri Apr 02 03:25:48 2004 +0000
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT([gaim], [0.76], [gaim-devel@lists.sourceforge.net])
+AC_INIT([gaim], [0.77cvs], [gaim-devel@lists.sourceforge.net])
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 
--- a/plugins/gestures/stroke-draw.c	Fri Apr 02 02:28:38 2004 +0000
+++ b/plugins/gestures/stroke-draw.c	Fri Apr 02 03:25:48 2004 +0000
@@ -125,7 +125,7 @@
       gdk_pointer_grab (widget->window, FALSE,
 			GDK_BUTTON_RELEASE_MASK, NULL, cursor,
 			event->button.time);
-      timer_id = gtk_timeout_add (GSTROKE_TIMEOUT_DURATION,
+      timer_id = g_timeout_add (GSTROKE_TIMEOUT_DURATION,
 				  gstroke_timeout, widget);
       return TRUE;
 
@@ -139,7 +139,7 @@
 		  original_widget = NULL;
 
 		  if (timer_id > 0)
-			  gtk_timeout_remove (timer_id);
+			  g_source_remove (timer_id);
 
 		  gdk_pointer_ungrab (event->button.time);
 		  timer_id = 0;
@@ -156,7 +156,7 @@
 
       last_mouse_position.invalid = TRUE;
       original_widget = NULL;
-      gtk_timeout_remove (timer_id);
+      g_source_remove (timer_id);
       gdk_pointer_ungrab (event->button.time);
       timer_id = 0;
 
--- a/src/gtkaccount.c	Fri Apr 02 02:28:38 2004 +0000
+++ b/src/gtkaccount.c	Fri Apr 02 03:25:48 2004 +0000
@@ -128,7 +128,9 @@
 	GtkWidget *proxy_frame;
 	GtkWidget *proxy_vbox;
 	GtkWidget *proxy_dropdown;
+#if !GTK_CHECK_VERSION(2,4,0)
 	GtkWidget *proxy_menu;
+#endif
 	GtkWidget *proxy_host_entry;
 	GtkWidget *proxy_port_entry;
 	GtkWidget *proxy_user_entry;
@@ -762,6 +764,57 @@
 make_proxy_dropdown(void)
 {
 	GtkWidget *dropdown;
+
+#if GTK_CHECK_VERSION(2,4,0)
+	GtkListStore *model;
+	GtkTreeIter iter;
+	GtkCellRenderer *renderer;
+
+	model = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_INT);
+	dropdown = gtk_combo_box_new_with_model(GTK_TREE_MODEL(model));
+
+	gtk_list_store_append(model, &iter);
+	gtk_list_store_set(model, &iter,
+			0, _("Use Global Proxy Settings"),
+			1, GAIM_PROXY_USE_GLOBAL
+			-1);
+
+	gtk_list_store_append(model, &iter);
+	gtk_list_store_set(model, &iter,
+			0, _("No Proxy"),
+			1, GAIM_PROXY_NONE,
+			-1);
+
+	gtk_list_store_append(model, &iter);
+	gtk_list_store_set(model, &iter,
+			0, _("HTTP"),
+			1, GAIM_PROXY_HTTP,
+			-1);
+
+	gtk_list_store_append(model, &iter);
+	gtk_list_store_set(model, &iter,
+			0, _("SOCKS 4"),
+			1, GAIM_PROXY_SOCKS4,
+			-1);
+
+	gtk_list_store_append(model, &iter);
+	gtk_list_store_set(model, &iter,
+			0, _("SOCKS 5"),
+			1, GAIM_PROXY_SOCKS5,
+			-1);
+
+	gtk_list_store_append(model, &iter);
+	gtk_list_store_set(model, &iter,
+			0, _("Use Environmental Settings"),
+			1, GAIM_PROXY_USE_ENVVAR,
+			-1);
+
+	renderer = gtk_cell_renderer_text_new();
+	gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(dropdown), renderer, TRUE);
+	gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(dropdown), renderer,
+			"text", 0, NULL);
+
+#else
 	GtkWidget *menu;
 	GtkWidget *item;
 
@@ -811,15 +864,21 @@
 	gtk_widget_show(item);
 
 	gtk_option_menu_set_menu(GTK_OPTION_MENU(dropdown), menu);
+#endif
 
 	return dropdown;
 }
 
 static void
-proxy_type_changed_cb(GtkWidget *optmenu, AccountPrefsDialog *dialog)
+proxy_type_changed_cb(GtkWidget *menu, AccountPrefsDialog *dialog)
 {
+#if GTK_CHECK_VERSION(2,4,0)
 	dialog->new_proxy_type =
-		gtk_option_menu_get_history(GTK_OPTION_MENU(optmenu)) - 1;
+		gtk_combo_box_get_active(GTK_COMBO_BOX(menu)) - 1;
+#else
+	dialog->new_proxy_type =
+		gtk_option_menu_get_history(GTK_OPTION_MENU(menu)) - 1;
+#endif
 
 	if (dialog->new_proxy_type == GAIM_PROXY_USE_GLOBAL ||
 		dialog->new_proxy_type == GAIM_PROXY_NONE ||
@@ -870,8 +929,10 @@
 
 	/* Proxy Type drop-down. */
 	dialog->proxy_dropdown = make_proxy_dropdown();
+#if !GTK_CHECK_VERSION(2,4,0)
 	dialog->proxy_menu =
 		gtk_option_menu_get_menu(GTK_OPTION_MENU(dialog->proxy_dropdown));
+#endif
 
 	add_pref_box(dialog, vbox, _("Proxy _type:"), dialog->proxy_dropdown);
 
@@ -909,8 +970,13 @@
 		/* Hah! */
 		/* I dunno what you're laughing about, fuzz ball. */
 		dialog->new_proxy_type = type;
+#if GTK_CHECK_VERSION(2,4,0)
+		gtk_combo_box_set_active(GTK_COMBO_BOX(dialog->proxy_dropdown),
+				type - 1);
+#else
 		gtk_option_menu_set_history(GTK_OPTION_MENU(dialog->proxy_dropdown),
-									(int)type + 1);
+				(int)type + 1);
+#endif
 
 		if (type == GAIM_PROXY_USE_GLOBAL || type == GAIM_PROXY_NONE ||
 			type == GAIM_PROXY_USE_ENVVAR) {
@@ -940,8 +1006,13 @@
 	}
 	else {
 		dialog->new_proxy_type = GAIM_PROXY_USE_GLOBAL;
+#if GTK_CHECK_VERSION(2,4,0)
+		gtk_combo_box_set_active(GTK_COMBO_BOX(dialog->proxy_dropdown),
+				dialog->new_proxy_type + 1);
+#else
 		gtk_option_menu_set_history(GTK_OPTION_MENU(dialog->proxy_dropdown),
 									dialog->new_proxy_type + 1);
+#endif
 		gtk_widget_hide_all(vbox2);
 	}