changeset 15940:fd9482f9f604

merge of '3373e976438182796e93bab7ded908eba4db04ed' and 'e8a93071ea487cda30c11aee38b1763a8fccaceb'
author Richard Nelson <wabz@pidgin.im>
date Tue, 27 Mar 2007 00:46:44 +0000
parents 0f1ab43db297 (current diff) d04878ce947b (diff)
children 47a9454dbb95
files
diffstat 7 files changed, 75 insertions(+), 75 deletions(-) [+]
line wrap: on
line diff
--- a/config.h.mingw	Tue Mar 27 00:46:18 2007 +0000
+++ b/config.h.mingw	Tue Mar 27 00:46:44 2007 +0000
@@ -26,10 +26,10 @@
 #define ENABLE_NLS 1
 
 /* Define to make assertions fatal (useful for debugging). */
-/* #undef GAIM_FATAL_ASSERTS */
+/* #undef PURPLE_FATAL_ASSERTS */
 
 /* Define if plugins are enabled. */
-#define GAIM_PLUGINS 1
+#define PURPLE_PLUGINS 1
 
 /* Define to 1 if you have `alloca', as a function or macro. */
 #define HAVE_ALLOCA 1
@@ -523,7 +523,7 @@
 #define PACKAGE "pidgin"
 
 /* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "gaim-devel@lists.sourceforge.net"
+#define PACKAGE_BUGREPORT "devel@pidgin.im"
 
 /* Define to the full name of this package. */
 #define PACKAGE_NAME "pidgin"
--- a/libpurple/win32/libpurplerc.rc.in	Tue Mar 27 00:46:18 2007 +0000
+++ b/libpurple/win32/libpurplerc.rc.in	Tue Mar 27 00:46:44 2007 +0000
@@ -16,12 +16,12 @@
       BEGIN
         VALUE "CompanyName", "The Pidgin developer community"
         VALUE "FileDescription", "LibPurple Library"
-        VALUE "FileVersion", "@PIDGIN_VERSION@"
+        VALUE "FileVersion", "@PURPLE_VERSION@"
         VALUE "InternalName", "libpurple"
         VALUE "LegalCopyright", "Copyright (C) 1998-2007 The Pidgin developer community (See the COPYRIGHT file in the source distribution)."
         VALUE "OriginalFilename", "libpurple.dll"
         VALUE "ProductName", "LibPurple"
-        VALUE "ProductVersion", "@PIDGIN_VERSION@"
+        VALUE "ProductVersion", "@PURPLE_VERSION@"
       END
     END
     BLOCK "VarFileInfo"
--- a/pidgin/gtkaccount.c	Tue Mar 27 00:46:18 2007 +0000
+++ b/pidgin/gtkaccount.c	Tue Mar 27 00:46:44 2007 +0000
@@ -231,7 +231,7 @@
 		/* Show a placeholder icon */
 		gchar *filename;
 		filename = g_build_filename(DATADIR, "pixmaps",
-				"purple", "insert-image.png", NULL);
+				"pidgin", "insert-image.png", NULL);
 		pixbuf = gdk_pixbuf_new_from_file(filename, NULL);
 		g_free(filename);
 	}
@@ -629,7 +629,7 @@
 		set_dialog_icon(dialog,
 				g_strdup(purple_account_get_ui_string(dialog->account,
 						PIDGIN_UI, "non-global-buddyicon-cached-path", NULL)),
-				g_strdup(purple_account_get_ui_string(dialog->account, 
+				g_strdup(purple_account_get_ui_string(dialog->account,
 						PIDGIN_UI, "non-global-buddyicon-path", NULL)));
 	} else {
 		set_dialog_icon(dialog, NULL, NULL);
@@ -2142,12 +2142,12 @@
 	/* Translators: Please maintain the use of -> or <- to represent the menu heirarchy */
 	pretty = pidgin_make_pretty_arrows(_(
 						 "<span size='larger' weight='bold'>Welcome to " PIDGIN_NAME "!</span>\n\n"
-						 
+
 						 "You have no IM accounts configured. To start connecting with " PIDGIN_NAME " "
 						 "press the <b>Add</b> button below and configure your first "
 						 "account. If you want " PIDGIN_NAME " 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->Add/Edit</b> in the Buddy "
 						 "List window"));
@@ -2439,7 +2439,7 @@
 
 	buffer = make_info(account, gc, remote_user, id, alias, msg);
 	alert = pidgin_make_mini_dialog(gc, PIDGIN_STOCK_DIALOG_QUESTION,
-					  _("Add buddy to your list?"), buffer, data, 
+					  _("Add buddy to your list?"), buffer, data,
 					  _("Add"), G_CALLBACK(add_user_cb),
 					  _("Cancel"), G_CALLBACK(free_add_user_data), NULL);
 	pidgin_blist_add_alert(alert);
@@ -2515,27 +2515,27 @@
 		aa->account = account;
 		alert = pidgin_make_mini_dialog(gc, PIDGIN_STOCK_DIALOG_QUESTION,
 						  _("Authorize buddy?"), buffer, aa,
-						  _("Authorize"), authorize_and_add_cb, 
-						  _("Deny"), deny_no_add_cb, 
+						  _("Authorize"), authorize_and_add_cb,
+						  _("Deny"), deny_no_add_cb,
 						  NULL);
 	} else {
 		alert = pidgin_make_mini_dialog(gc, PIDGIN_STOCK_DIALOG_QUESTION,
 						  _("Authorize buddy?"), buffer, user_data,
-						  _("Authorize"), auth_cb, 
-						  _("Deny"), deny_cb, 
+						  _("Authorize"), auth_cb,
+						  _("Deny"), deny_cb,
 						  NULL);
 	}
 	pidgin_blist_add_alert(alert);
 
 	g_free(buffer);
-	
+
 	return NULL;
 }
 
 static void
 pidgin_accounts_request_close(void *ui_handle)
 {
-	
+
 }
 
 static PurpleAccountUiOps ui_ops =
--- a/pidgin/gtkstatusbox.c	Tue Mar 27 00:46:18 2007 +0000
+++ b/pidgin/gtkstatusbox.c	Tue Mar 27 00:46:44 2007 +0000
@@ -279,7 +279,7 @@
 		if (!g_ascii_strncasecmp(name, "file://", 7)) {
 			GError *converr = NULL;
 			gchar *tmp, *rtmp;
-		
+
 			if(!(tmp = g_filename_from_uri(name, NULL, &converr))) {
 				purple_debug(PURPLE_DEBUG_ERROR, "buddyicon", "%s\n",
 					   (converr ? converr->message :
@@ -559,7 +559,7 @@
 	PurpleAccount *acct = (status_box->token_status_account) ? status_box->token_status_account : status_box->account;
 
 	icon_size = gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL);
-	
+
 	style = gtk_widget_get_style(GTK_WIDGET(status_box));
 	snprintf(aa_color, sizeof(aa_color), "#%02x%02x%02x",
 		 style->text_aa[GTK_STATE_NORMAL].red >> 8,
@@ -584,7 +584,7 @@
 		if (!gtk_tree_model_get_iter (GTK_TREE_MODEL(status_box->dropdown_store), &iter, path))
 			return;
 		gtk_tree_path_free(path);
-		
+
 		gtk_tree_model_get(GTK_TREE_MODEL(status_box->dropdown_store), &iter,
 						   TYPE_COLUMN, &type,
 						   DATA_COLUMN, &data,
@@ -688,7 +688,7 @@
 			}
 		}
 #endif
-		
+
 	}
 
 	if (status_box->account != NULL) {
@@ -824,7 +824,7 @@
 						break;
 					}
 					g_free(name);
-				
+
 				} else if ((type == PIDGIN_STATUS_BOX_TYPE_POPULAR) &&
 						(GPOINTER_TO_INT(data) == purple_savedstatus_get_creation_time(saved_status)))
 				{
@@ -1186,7 +1186,7 @@
 cache_pixbufs(PidginStatusBox *status_box)
 {
 	GtkIconSize icon_size;
-	
+
 	g_object_set(G_OBJECT(status_box->icon_rend), "xpad", 3, NULL);
 	icon_size = gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL);
 
@@ -1311,14 +1311,14 @@
 #endif
   GtkRequisition popup_req;
   GtkPolicyType hpolicy, vpolicy;
-  
+
   gdk_window_get_origin (GTK_WIDGET(status_box)->window, x, y);
 
   *x += GTK_WIDGET(status_box)->allocation.x;
   *y += GTK_WIDGET(status_box)->allocation.y;
- 
+
   *width = GTK_WIDGET(status_box)->allocation.width;
-  
+
   hpolicy = vpolicy = GTK_POLICY_NEVER;
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (status_box->scrolled_window),
 				  hpolicy, vpolicy);
@@ -1336,7 +1336,7 @@
 
 #if GTK_CHECK_VERSION(2,2,0)
   screen = gtk_widget_get_screen (GTK_WIDGET (status_box));
-  monitor_num = gdk_screen_get_monitor_at_window (screen, 
+  monitor_num = gdk_screen_get_monitor_at_window (screen,
 						  GTK_WIDGET (status_box)->window);
   gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor);
 
@@ -1344,7 +1344,7 @@
     *x = monitor.x;
   else if (*x + *width > monitor.x + monitor.width)
     *x = monitor.x + monitor.width - *width;
-  
+
   if (*y + GTK_WIDGET(status_box)->allocation.height + *height <= monitor.y + monitor.height)
 	  *y += GTK_WIDGET(status_box)->allocation.height;
   else if (*y - *height >= monitor.y)
@@ -1354,7 +1354,7 @@
 	    *y += GTK_WIDGET(status_box)->allocation.height;
 	    *height = monitor.y + monitor.height - *y;
     }
-  else 
+  else
     {
 	    *height = *y - monitor.y;
 	    *y = monitor.y;
@@ -1363,7 +1363,7 @@
   if (popup_req.height > *height)
     {
       vpolicy = GTK_POLICY_ALWAYS;
-      
+
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (status_box->scrolled_window),
 				      hpolicy, vpolicy);
     }
@@ -1406,8 +1406,8 @@
 {
 	int width, height, x, y;
 	pidgin_status_box_list_position (box, &x, &y, &width, &height);
-  
-	gtk_widget_set_size_request (box->popup_window, width, height);  
+
+	gtk_widget_set_size_request (box->popup_window, width, height);
 	gtk_window_move (GTK_WINDOW (box->popup_window), x, y);
 	gtk_widget_show(box->popup_window);
 	gtk_widget_grab_focus (box->tree_view);
@@ -1442,7 +1442,7 @@
 toggled_cb(GtkWidget *widget, PidginStatusBox *box)
 {
 	if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)))  {
-		if (!box->popup_in_progress) 
+		if (!box->popup_in_progress)
 			pidgin_status_box_popup (box);
 	}  else {
 		pidgin_status_box_popdown(box);
@@ -1531,38 +1531,38 @@
 {
 	if (status_box->active_row)
 		gtk_tree_row_reference_free(status_box->active_row);
-	
+
 	status_box->active_row = gtk_tree_row_reference_new(GTK_TREE_MODEL(status_box->dropdown_store), path);
-	
+
 	pidgin_status_box_popdown (status_box);
 	pidgin_status_box_changed(status_box);
 }
 
-static gboolean 
-treeview_button_release_cb(GtkWidget *widget, GdkEventButton *event, PidginStatusBox *status_box) 
+static gboolean
+treeview_button_release_cb(GtkWidget *widget, GdkEventButton *event, PidginStatusBox *status_box)
 {
 	GtkTreePath *path = NULL;
 	int ret;
 	GtkWidget *ewidget = gtk_get_event_widget ((GdkEvent *)event);
-	
+
 	if (ewidget != status_box->tree_view) {
-		if (ewidget == status_box->toggle_button && 
+		if (ewidget == status_box->toggle_button &&
 		    status_box->popup_in_progress &&
 		    gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (status_box->toggle_button))) {
 			pidgin_status_box_popdown (status_box);
 			return TRUE;
 		}
-		
+
 		/* released outside treeview */
-		if (ewidget != status_box->toggle_button) 
+		if (ewidget != status_box->toggle_button)
 			{
 				pidgin_status_box_popdown (status_box);
 				return TRUE;
 			}
-		
+
 		return FALSE;
 	}
-	
+
 	ret = gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (status_box->tree_view),
 					     event->x, event->y,
 					     &path,
@@ -1570,7 +1570,7 @@
 
 	if (!ret)
 		return TRUE; /* clicked outside window? */
-	
+
 	treeview_activate_current_selection(status_box, path);
 	gtk_tree_path_free (path);
 
@@ -1620,7 +1620,7 @@
 	status_box->cell_view = gtk_cell_view_new();
 	status_box->vsep = gtk_vseparator_new();
 	status_box->arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE);
-	
+
 	status_box->store = gtk_list_store_new(NUM_COLUMNS, G_TYPE_INT, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_POINTER);
 	status_box->dropdown_store = gtk_list_store_new(NUM_COLUMNS, G_TYPE_INT, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_POINTER);
 ;
@@ -1696,7 +1696,7 @@
 	gtk_tree_view_set_search_column(GTK_TREE_VIEW(status_box->tree_view), TEXT_COLUMN);
 	gtk_tree_view_set_search_equal_func(GTK_TREE_VIEW(status_box->tree_view),
 				pidgin_tree_view_search_equal_func, NULL, NULL);
-	  
+
 #if GTK_CHECK_VERSION(2, 6, 0)
 	g_object_set(text_rend, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
 #endif
@@ -1907,7 +1907,7 @@
 		gtk_paint_box(widget->style, widget->window, GTK_STATE_NORMAL, GTK_SHADOW_OUT, NULL,
 				status_box->icon_box, "button", status_box->icon_box->allocation.x-1, status_box->icon_box->allocation.y-1,
 				34, 34);
-	}		
+	}
 	return FALSE;
 }
 
@@ -2064,7 +2064,7 @@
 		/* Show a placeholder icon */
 		gchar *filename;
 		filename = g_build_filename(DATADIR, "pixmaps",
-				"purple", "insert-image.png", NULL);
+				"pidgin", "insert-image.png", NULL);
 		status_box->buddy_icon = gdk_pixbuf_new_from_file(filename, NULL);
 		g_free(filename);
 	}
@@ -2138,7 +2138,7 @@
 	char *message;
 	PurpleSavedStatus *saved_status = NULL;
 	gboolean changed = TRUE;
-	
+
 	path = gtk_tree_row_reference_get_path(status_box->active_row);
 	if (!gtk_tree_model_get_iter (GTK_TREE_MODEL(status_box->dropdown_store), &iter, path))
 		return;
@@ -2188,7 +2188,7 @@
 			const char *id = NULL;
 			GtkTreePath *path = gtk_tree_row_reference_get_path(status_box->active_row);
 			active = gtk_tree_path_get_indices(path)[0];
-			
+
 			gtk_tree_path_free(path);
 
 			status = purple_account_get_active_status(status_box->token_status_account);
@@ -2386,13 +2386,13 @@
 	GList *accounts = NULL, *node;
 	int active;
 
-	
+
 	if (!gtk_tree_model_get_iter (GTK_TREE_MODEL(status_box->dropdown_store), &iter, path))
 		return;
 	active = gtk_tree_path_get_indices(path)[0];
 	gtk_tree_path_free(path);
 	g_object_set_data(G_OBJECT(status_box), "active", GINT_TO_POINTER(active));
-	
+
 	gtk_tree_model_get(GTK_TREE_MODEL(status_box->dropdown_store), &iter,
 			   TYPE_COLUMN, &type,
 			   DATA_COLUMN, &data,
--- a/pidgin/pixmaps/Makefile.mingw	Tue Mar 27 00:46:18 2007 +0000
+++ b/pidgin/pixmaps/Makefile.mingw	Tue Mar 27 00:46:44 2007 +0000
@@ -18,24 +18,24 @@
 	    $(MAKE) -C $$subdir -f $(GAIM_WIN32_MAKEFILE) install || exit 1 ;\
 	  done; \
 	fi;
-	if test '$(gaimbuttonpix_DATA)'; then \
-	  mkdir -p $(gaimbuttonpixdir); \
-	  cp $(gaimbuttonpix_DATA) $(gaimbuttonpixdir); \
+	if test '$(pidginbuttonpix_DATA)'; then \
+	  mkdir -p $(pidginbuttonpixdir); \
+	  cp $(pidginbuttonpix_DATA) $(pidginbuttonpixdir); \
 	fi;
-	if test '$(gaimdialogpix_DATA)'; then \
-	  mkdir -p $(gaimdialogpixdir); \
-	  cp $(gaimdialogpix_DATA) $(gaimdialogpixdir); \
+	if test '$(pidgindialogpix_DATA)'; then \
+	  mkdir -p $(pidgindialogpixdir); \
+	  cp $(pidgindialogpix_DATA) $(pidgindialogpixdir); \
 	fi;
-	if test '$(gaimiconpix_DATA)'; then \
-	  mkdir -p $(gaimiconpixdir); \
-	  cp $(gaimiconpix_DATA) $(gaimiconpixdir); \
+	if test '$(pidginiconpix_DATA)'; then \
+	  mkdir -p $(pidginiconpixdir); \
+	  cp $(pidginiconpix_DATA) $(pidginiconpixdir); \
 	fi;
-	if test '$(gaimdistpix_DATA)'; then \
-	  mkdir -p $(gaimdistpixdir); \
-	  cp $(gaimdistpix_DATA) $(gaimdistpixdir); \
+	if test '$(pidgindistpix_DATA)'; then \
+	  mkdir -p $(pidgindistpixdir); \
+	  cp $(pidgindistpix_DATA) $(pidgindistpixdir); \
 	fi;
-	if test '$(distpixmap_DATA)'; then \
-	  mkdir -p $(distpixmapdir); \
-	  cp $(distpixmap_DATA) $(distpixmapdir); \
-	fi;
+#	if test '$(distpixmap_DATA)'; then \
+#	  mkdir -p $(distpixmapdir); \
+#	  cp $(distpixmap_DATA) $(distpixmapdir); \
+#	fi;
 
--- a/pidgin/win32/nsis/pidgin-installer.nsi	Tue Mar 27 00:46:18 2007 +0000
+++ b/pidgin/win32/nsis/pidgin-installer.nsi	Tue Mar 27 00:46:44 2007 +0000
@@ -698,7 +698,7 @@
     Delete "$INSTDIR\plugins\buddynote.dll"
     Delete "$INSTDIR\plugins\convcolors.dll"
     Delete "$INSTDIR\plugins\extplacement.dll"
-    Delete "$INSTDIR\plugins\gaimrc.dll"
+    Delete "$INSTDIR\plugins\pidginrc.dll"
     Delete "$INSTDIR\plugins\history.dll"
     Delete "$INSTDIR\plugins\iconaway.dll"
     Delete "$INSTDIR\plugins\idle.dll"
@@ -735,12 +735,12 @@
     Delete "$INSTDIR\plugins\win2ktrans.dll"
     Delete "$INSTDIR\plugins\winprefs.dll"
     RMDir "$INSTDIR\plugins"
-    Delete "$INSTDIR\sounds\gaim\alert.wav"
-    Delete "$INSTDIR\sounds\gaim\login.wav"
-    Delete "$INSTDIR\sounds\gaim\logout.wav"
-    Delete "$INSTDIR\sounds\gaim\receive.wav"
-    Delete "$INSTDIR\sounds\gaim\send.wav"
-    RMDir "$INSTDIR\sounds\gaim"
+    Delete "$INSTDIR\sounds\pidgin\alert.wav"
+    Delete "$INSTDIR\sounds\pidgin\login.wav"
+    Delete "$INSTDIR\sounds\pidgin\logout.wav"
+    Delete "$INSTDIR\sounds\pidgin\receive.wav"
+    Delete "$INSTDIR\sounds\pidgin\send.wav"
+    RMDir "$INSTDIR\sounds\pidgin"
     RMDir "$INSTDIR\sounds"
     Delete "$INSTDIR\freebl3.dll"
     Delete "$INSTDIR\idletrack.dll"
--- a/pidgin/win32/pidgin_exe_rc.rc.in	Tue Mar 27 00:46:18 2007 +0000
+++ b/pidgin/win32/pidgin_exe_rc.rc.in	Tue Mar 27 00:46:44 2007 +0000
@@ -33,4 +33,4 @@
     END
   END
 
-PURPLE_ICON			ICON PIXMAPDIR "pidgin.ico"
+PIDGIN_ICON			ICON PIXMAPDIR "pidgin.ico"