Mercurial > pidgin

changeset 25920:c0e3b62f8098

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Alphabetize files in a few Makefile.am files * Alphabetize some #includes * Alphabetize listings in ChangeLog.API * Add a few things to ChangeLog.API that were left out * Other minor whitespace changes
author Mark Doliner <mark@kingant.net>
date Mon, 26 Jan 2009 06:03:06 +0000
parents 52b2e7260340
children d25cbbea7fe5
files ChangeLog.API libpurple/Makefile.am libpurple/core.c pidgin/Makefile.am pidgin/gtkblist.c pidgin/gtksound.c
diffstat 6 files changed, 45 insertions(+), 37 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog.API	Mon Jan 26 04:19:00 2009 +0000
+++ b/ChangeLog.API	Mon Jan 26 06:03:06 2009 +0000
@@ -3,28 +3,29 @@
 version 2.6.0 (??/??/????):
 	libpurple:
 		Added:
+		* PURPLE_BLIST_NODE
+		* PURPLE_GROUP
+		* PURPLE_CONTACT
+		* PURPLE_BUDDY
+		* PURPLE_CHAT
 		* purple_buddy_get_protocol_data
 		* purple_buddy_set_protocol_data
-		* purple_connection_get_protocol_data
-		* purple_connection_set_protocol_data
 		* purple_buddy_get_local_buddy_alias
 		* purple_blist_get_buddies
 		* purple_blist_get_ui_data
 		* purple_blist_set_ui_data
 		* purple_blist_node_get_ui_data
 		* purple_blist_node_set_ui_data
-		* PURPLE_BLIST_NODE
-		* PURPLE_GROUP
-		* PURPLE_CONTACT
-		* PURPLE_BUDDY
-		* PURPLE_CHAT
+		* purple_connection_get_protocol_data
+		* purple_connection_set_protocol_data
+		* purple_global_proxy_set_info
+		* purple_log_get_activity_score
+		* purple_network_force_online
 		* purple_request_field_get_group
 		* purple_request_field_get_ui_data
 		* purple_request_field_set_ui_data
-		* purple_network_force_online
-		* purple_global_proxy_set_info
 		* purple_strequal
-		* purple_log_get_activity_score
+		* xmlnode_from_file
 
 		Deprecated:
 		* purple_buddy_get_local_alias
@@ -35,6 +36,9 @@
 		* gtk_imhtml_link_get_url, gtk_imhtml_link_get_text_tag,
 		  gtk_imhtml_link_activate functions to process GtkIMHtmlLink
 		  objects from GtkIMHtml protocol callbacks.
+		* pidgin_blist_set_theme
+		* pidgin_blist_get_theme
+		* pidgin_sound_is_customized
 		* pidgin_utils_init, pidgin_utils_uninit
 
 	perl:
--- a/libpurple/Makefile.am	Mon Jan 26 04:19:00 2009 +0000
+++ b/libpurple/Makefile.am	Mon Jan 26 06:03:06 2009 +0000
@@ -75,13 +75,13 @@
 	stringref.c \
 	stun.c \
 	sound.c \
+	sound-theme.c \
 	sound-theme-loader.c \
-	sound-theme.c \
 	sslconn.c \
-	upnp.c \
 	theme.c \
 	theme-loader.c \
 	theme-manager.c \
+	upnp.c \
 	util.c \
 	value.c \
 	version.c \
@@ -133,13 +133,13 @@
 	stringref.h \
 	stun.h \
 	sound.h \
+	sound-theme.h \
 	sound-theme-loader.h \
-	sound-theme.h \
 	sslconn.h \
-	upnp.h \
 	theme.h \
 	theme-loader.h \
 	theme-manager.h \
+	upnp.h \
 	util.h \
 	value.h \
 	xmlnode.h \
--- a/libpurple/core.c	Mon Jan 26 04:19:00 2009 +0000
+++ b/libpurple/core.c	Mon Jan 26 06:03:06 2009 +0000
@@ -50,8 +50,8 @@
 #include "sslconn.h"
 #include "status.h"
 #include "stun.h"
+#include "theme-manager.h"
 #include "util.h"
-#include "theme-manager.h"
 
 #ifdef HAVE_DBUS
 #  ifndef DBUS_API_SUBJECT_TO_CHANGE
@@ -146,6 +146,7 @@
 	purple_plugins_probe(G_MODULE_SUFFIX);
 
 	purple_theme_manager_init();
+
 	/* The buddy icon code uses the imgstore, so init it early. */
 	purple_imgstore_init();
 
--- a/pidgin/Makefile.am	Mon Jan 26 04:19:00 2009 +0000
+++ b/pidgin/Makefile.am	Mon Jan 26 06:03:06 2009 +0000
@@ -78,8 +78,8 @@
 	pidginstock.c \
 	gtkaccount.c \
 	gtkblist.c \
+	gtkblist-theme.c \
 	gtkblist-theme-loader.c \
-	gtkblist-theme.c \
 	gtkcelllayout.c \
 	gtkcellrendererexpander.c \
 	gtkcellrendererprogress.c \
@@ -132,8 +132,8 @@
 	eggtrayicon.h \
 	gtkaccount.h \
 	gtkblist.h \
+	gtkblist-theme.h \
 	gtkblist-theme-loader.h \
-	gtkblist-theme.h \
 	gtkcelllayout.h \
 	gtkcellrendererexpander.h \
 	gtkcellrendererprogress.h \
--- a/pidgin/gtkblist.c	Mon Jan 26 04:19:00 2009 +0000
+++ b/pidgin/gtkblist.c	Mon Jan 26 06:03:06 2009 +0000
@@ -60,8 +60,8 @@
 #include "gtkstatusbox.h"
 #include "gtkscrollbook.h"
 #include "gtksmiley.h"
+#include "gtkblist-theme.h"
 #include "gtkblist-theme-loader.h"
-#include "gtkblist-theme.h"
 #include "gtkutils.h"
 #include "pidgin/minidialog.h"
 #include "pidgin/pidgintooltip.h"
@@ -3971,15 +3971,16 @@
 				iday = (t - idle_secs) / (24 * 60 * 60);
 				ihrs = ((t - idle_secs) / 60 / 60) % 24;
 				imin = ((t - idle_secs) / 60) % 60;
-	
-               			if (iday)
+
+				if (iday)
 					idletime = g_strdup_printf(_("Idle %dd %dh %02dm"), iday, ihrs, imin);
 				else if (ihrs)
 					idletime = g_strdup_printf(_("Idle %dh %02dm"), ihrs, imin);
 				else
 					idletime = g_strdup_printf(_("Idle %dm"), imin);
 
-			} else idletime = g_strdup(_("Idle"));
+			} else
+				idletime = g_strdup(_("Idle"));
 		}
 	}
 
@@ -4041,13 +4042,12 @@
 				        (idletime != NULL && statustext != NULL) ? " - " : "",
 				        statustext != NULL ? statustext : ""); 
 
-	} else text = g_strdup_printf("<span font_desc='%s' color='%s'>%s</span>", name_font, name_color, nametext); 
+	} else
+		text = g_strdup_printf("<span font_desc='%s' color='%s'>%s</span>", name_font, name_color, nametext); 
 
 	g_free(nametext);
-	if (statustext)
-		g_free(statustext);
-	if (idletime)
-		g_free(idletime);
+	g_free(statustext);
+	g_free(idletime);
 
 	if (hidden_conv) {
 		char *tmp = text;
@@ -6086,7 +6086,8 @@
 			bgcolor = NULL;
 		else if (purple_blist_node_get_bool(gnode, "collapsed") || count <= 0)
 			bgcolor = pidgin_blist_theme_get_collapsed_background_color(theme);
-		else bgcolor = pidgin_blist_theme_get_expanded_background_color(theme);
+		else
+			bgcolor = pidgin_blist_theme_get_expanded_background_color(theme);
 
 		path = gtk_tree_model_get_path(GTK_TREE_MODEL(gtkblist->treemodel), &iter);
 		expanded = gtk_tree_view_row_expanded(GTK_TREE_VIEW(gtkblist->treeview), path);
@@ -6148,9 +6149,10 @@
 	theme = pidgin_blist_get_theme();
 	if (theme == NULL)
 		pair = NULL;
-	else if 
-		(expanded) pair = pidgin_blist_theme_get_expanded_text_info(theme);
-	else pair = pidgin_blist_theme_get_collapsed_text_info(theme);
+	else if (expanded)
+		pair = pidgin_blist_theme_get_expanded_text_info(theme);
+	else
+		pair = pidgin_blist_theme_get_collapsed_text_info(theme);
 
 	
 	text_color = (selected || pair == NULL || pair->color == NULL) ? "black" : pair->color;
@@ -6218,7 +6220,8 @@
 
 			if (!selected && theme != NULL && (pair = pidgin_blist_theme_get_idle_text_info(theme)) != NULL && pair->color != NULL)
 				textcolor = pair->color;
-			else textcolor = "black";
+			else
+				textcolor = "black";
 
 			idle = g_strdup_printf("<span color='%s' font_desc='%s'>%d:%02d</span>", textcolor, 
 					      (pair == NULL || pair->font == NULL) ? "" : pair->font, ihrs, imin);
@@ -7360,7 +7363,8 @@
 	if (theme != NULL)
 		purple_prefs_set_string(PIDGIN_PREFS_ROOT "/blist/theme", 
 				purple_theme_get_name(PURPLE_THEME(theme)));
-	else purple_prefs_set_string(PIDGIN_PREFS_ROOT "/blist/theme", "");
+	else
+		purple_prefs_set_string(PIDGIN_PREFS_ROOT "/blist/theme", "");
 
 	priv->current_theme = theme;
 
--- a/pidgin/gtksound.c	Mon Jan 26 04:19:00 2009 +0000
+++ b/pidgin/gtksound.c	Mon Jan 26 06:03:06 2009 +0000
@@ -575,14 +575,13 @@
 			sounds[event].pref);
 	file_pref = g_strdup_printf(PIDGIN_PREFS_ROOT "/sound/file/%s", sounds[event].pref);
 
-
-
 	/* check NULL for sounds that don't have an option, ie buddy pounce */
 	if (purple_prefs_get_bool(enable_pref)) {
 		char *filename = g_strdup(purple_prefs_get_path(file_pref));
 		theme_name = purple_prefs_get_string(PIDGIN_PREFS_ROOT "/sound/theme");
 		
-		if (theme_name && strlen(theme_name) && (!filename || !strlen(filename))){ /* Use theme */
+		if (theme_name && *theme_name && (!filename || !*filename)) {
+			/* Use theme */
 			g_free(filename);
 
 			theme = PURPLE_SOUND_THEME(purple_theme_manager_find_theme(theme_name, "sound"));
@@ -617,12 +616,12 @@
 	gint i;	
 	gchar *path, *file;
 
-	for (i=0; i < PURPLE_NUM_SOUNDS; i++){
+	for (i = 0; i < PURPLE_NUM_SOUNDS; i++) {
 		path = g_strdup_printf(PIDGIN_PREFS_ROOT "/sound/file/%s", sounds[i].pref);
 		file = g_strdup(purple_prefs_get_path(path));
 		g_free(path);
 
-		if (file && strlen(file)){
+		if (file && file[0] != '\0'){
 			g_free(file);
 			return TRUE;
 		}