Mercurial > pidgin.yaz

changeset 9863:0e3a84f18467

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 10742] Whitespace and comment changes, mostly. And changed a few other things that aren't ansi c... committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Wed, 25 Aug 2004 03:09:08 +0000
parents ce03c2646a40
children df1e5075eb0f
files plugins/docklet/docklet-win32.c plugins/filectl.c plugins/timestamp.c src/gtkconv.c src/gtkimhtmltoolbar.c src/protocols/gg/gg.c src/protocols/gg/libgg.c src/protocols/gg/libgg.h src/proxy.c src/win32/IdleTracker/idletrack.c
diffstat 10 files changed, 34 insertions(+), 32 deletions(-) [+]
line wrap: on
line diff
--- a/plugins/docklet/docklet-win32.c	Wed Aug 25 02:04:38 2004 +0000
+++ b/plugins/docklet/docklet-win32.c	Wed Aug 25 03:09:08 2004 +0000
@@ -128,7 +128,7 @@
 
 	RegisterClassEx(&wcex);
 
-	// Create the window
+	/* Create the window */
 	return (CreateWindow(wname, "", 0, 0, 0, 0, 0, GetDesktopWindow(), NULL, wgaim_hinstance(), 0));
 }
 
--- a/plugins/filectl.c	Wed Aug 25 02:04:38 2004 +0000
+++ b/plugins/filectl.c	Wed Aug 25 03:09:08 2004 +0000
@@ -92,10 +92,10 @@
 			c = gaim_find_conversation(arg1);
 			if (c)
 			{
-			    /* disable for now
-			    gaim_conversation_write(c, arg2, WFLAG_SEND, NULL, time(NULL), -1);
-			    serv_send_im(c->gc, arg1, arg2, 0);
-			    */
+				/* disable for now
+				gaim_conversation_write(c, arg2, WFLAG_SEND, NULL, time(NULL), -1);
+				serv_send_im(c->gc, arg1, arg2, 0);
+				*/
 			}
 			free(arg1);
 			free(arg2);
@@ -104,13 +104,13 @@
 			serv_set_away_all(arg1);
 			free(arg1);
 		} else if (!strncasecmp(command, "hide", 4)) {
-		    //hide_buddy_list();
+			/* hide_buddy_list(); */
 		} else if (!strncasecmp(command, "unhide", 6)) {
-		    //unhide_buddy_list();
+			/* unhide_buddy_list(); */
 		} else if (!strncasecmp(command, "back", 4)) {
-		    //do_im_back();
+			/* do_im_back(); */
 		} else if (!strncasecmp(command, "quit", 4)) {
-		    //gaim_core_quit();
+			/* gaim_core_quit(); */
 		}
 		free(command);
 	}
--- a/plugins/timestamp.c	Wed Aug 25 02:04:38 2004 +0000
+++ b/plugins/timestamp.c	Wed Aug 25 03:09:08 2004 +0000
@@ -70,7 +70,7 @@
 
 static gboolean
 timestamp_displaying_conv_msg(GaimAccount *account, GaimConversation *conv,
-		     char **buffer, void *data)
+							  char **buffer, void *data)
 {
 	int is_timestamp_enabled;
 	
@@ -221,7 +221,7 @@
 	gaim_signal_connect(conv_handle, "conversation-created",
 					plugin, GAIM_CALLBACK(timestamp_new_convo), NULL);
 
-	//record IM display events for each conversation
+	/* record IM display events for each conversation */
 	gaim_signal_connect(conv_handle, "receiving-im-msg",
 					plugin, GAIM_CALLBACK(timestamp_receiving_msg), NULL);
 	gaim_signal_connect(conv_handle, "displaying-im-msg",
--- a/src/gtkconv.c	Wed Aug 25 02:04:38 2004 +0000
+++ b/src/gtkconv.c	Wed Aug 25 03:09:08 2004 +0000
@@ -171,6 +171,8 @@
 
 	gtkconv = GAIM_GTK_CONVERSATION(conv);
 
+	gtk_imhtml_scroll_to_end((GtkIMHtml *)gtkconv->imhtml);
+
 	/* we only save the new height if the formatting toolbar visibility matches the pref */
 	saveheight = (gtkconv->show_formatting_toolbar == gaim_prefs_get_bool("/gaim/gtk/conversations/show_formatting_toolbar"));
 
--- a/src/gtkimhtmltoolbar.c	Wed Aug 25 02:04:38 2004 +0000
+++ b/src/gtkimhtmltoolbar.c	Wed Aug 25 03:09:08 2004 +0000
@@ -257,7 +257,7 @@
 	} else if (toolbar->fgcolor_dialog != NULL) {
 		cancel_toolbar_fgcolor(color, toolbar);
 	} else {
-		//gaim_gtk_advance_past(gtkconv, "<FONT COLOR>", "</FONT>");
+		/* gaim_gtk_advance_past(gtkconv, "<FONT COLOR>", "</FONT>"); */
 	}
 	gtk_widget_grab_focus(toolbar->imhtml);
 }
@@ -330,7 +330,7 @@
 	} else if (toolbar->bgcolor_dialog != NULL) {
 		cancel_toolbar_bgcolor(color, toolbar);
 	} else {
-		//gaim_gtk_advance_past(gtkconv, "<FONT COLOR>", "</FONT>");
+		/* gaim_gtk_advance_past(gtkconv, "<FONT COLOR>", "</FONT>"); */
 	}
 	gtk_widget_grab_focus(toolbar->imhtml);
 }
@@ -792,7 +792,7 @@
 enum {
 	LAST_SIGNAL
 };
-//static guint signals [LAST_SIGNAL] = { 0 };
+/* static guint signals [LAST_SIGNAL] = { 0 }; */
 
 static void
 gtk_imhtmltoolbar_finalize (GObject *object)
--- a/src/protocols/gg/gg.c	Wed Aug 25 02:04:38 2004 +0000
+++ b/src/protocols/gg/gg.c	Wed Aug 25 03:09:08 2004 +0000
@@ -1,6 +1,6 @@
 /*
  * gaim - Gadu-Gadu Protocol Plugin
- * $Id: gg.c 10665 2004-08-20 22:05:18Z lschiere $
+ * $Id: gg.c 10742 2004-08-25 03:09:08Z thekingant $
  *
  * Copyright (C) 2001 Arkadiusz Mi¶kiewicz <misiek@pld.ORG.PL>
  *
@@ -1713,4 +1713,4 @@
 	my_protocol = plugin;
 }
 
-GAIM_INIT_PLUGIN(gg, init_plugin, info);
+GAIM_INIT_PLUGIN(gg, init_plugin, info)
--- a/src/protocols/gg/libgg.c	Wed Aug 25 02:04:38 2004 +0000
+++ b/src/protocols/gg/libgg.c	Wed Aug 25 03:09:08 2004 +0000
@@ -1,4 +1,4 @@
-/* $Id: libgg.c 10574 2004-08-08 05:38:02Z thekingant $ */
+/* $Id: libgg.c 10742 2004-08-25 03:09:08Z thekingant $ */
 
 /*
  *  (C) Copyright 2001 Wojtek Kaniewski <wojtekka@irc.pl>,
@@ -70,7 +70,7 @@
 #ifdef __GNUC__
 __attribute__ ((unused))
 #endif
-= "$Id: libgg.c 10574 2004-08-08 05:38:02Z thekingant $";
+= "$Id: libgg.c 10742 2004-08-25 03:09:08Z thekingant $";
 
 #endif 
 
@@ -690,7 +690,7 @@
 		errno = EFAULT;
 		return -1;
 	}
-	
+
 	if (sess->state != GG_STATE_CONNECTED) {
 		errno = ENOTCONN;
 		return -1;
@@ -702,7 +702,7 @@
 	s.seq = fix32(sess->seq);
 	s.msgclass = fix32(msgclass);
 	sess->seq += (rand() % 0x300) + 0x300;
-	
+
 	if (gg_send_packet(sess, GG_SEND_MSG, &s, sizeof(s), message, strlen(message) + 1, format, formatlen, NULL) == -1)
 		return -1;
 
@@ -731,7 +731,7 @@
 	}
 
 	gg_debug(GG_DEBUG_FUNCTION, "** gg_ping(...);\n");
-	
+
 	return gg_send_packet(sess, GG_PING, NULL);
 }
 
@@ -941,8 +941,8 @@
 	}
 
 	p = (void *)h + sizeof(struct gg_header);
-	
-	
+
+
 	switch (h->type) {
 	    case GG_RECV_MSG:
 	    {
--- a/src/protocols/gg/libgg.h	Wed Aug 25 02:04:38 2004 +0000
+++ b/src/protocols/gg/libgg.h	Wed Aug 25 03:09:08 2004 +0000
@@ -1,4 +1,4 @@
-/* $Id: libgg.h 10513 2004-08-04 18:27:09Z lschiere $ */
+/* $Id: libgg.h 10742 2004-08-25 03:09:08Z thekingant $ */
 
 /*
  *  (C) Copyright 2001 Wojtek Kaniewski <wojtekka@irc.pl>,
@@ -233,7 +233,7 @@
 	GG_EVENT_CONN_SUCCESS,
 	GG_EVENT_STATUS60,		/* kto¶ zmieni³ stan w GG 6.0 */
 	GG_EVENT_NOTIFY60,		/* kto¶ siź pojawi³ w GG 6.0 */
-	GG_EVENT_USERLIST,		/* odpowied¼ listy kontaktów w GG 6.0 */
+	GG_EVENT_USERLIST		/* odpowied¼ listy kontaktów w GG 6.0 */
 };
 
 /*
--- a/src/proxy.c	Wed Aug 25 02:04:38 2004 +0000
+++ b/src/proxy.c	Wed Aug 25 03:09:08 2004 +0000
@@ -708,7 +708,7 @@
 	 */
 	ret = getsockopt(source, SOL_SOCKET, SO_ERROR, &error, &len);
 	if (ret == 0 && error == EINPROGRESS)
-		return; // we'll be called again later
+		return; /* we'll be called again later */
 	if (ret < 0 || error != 0) {
 		if(ret!=0) error = errno;
 		close(source);
--- a/src/win32/IdleTracker/idletrack.c	Wed Aug 25 02:04:38 2004 +0000
+++ b/src/win32/IdleTracker/idletrack.c	Wed Aug 25 03:09:08 2004 +0000
@@ -40,12 +40,12 @@
 	BOOL fInit;
 
 	/* Set up the shared memory. */
-	/*hMapObject = CreateFileMapping((HANDLE) 0xFFFFFFFF,  //use paging file
-				       NULL,                // no security attributes
-				       PAGE_READWRITE,      // read/write access
-				       0,                   // size: high 32-bits
-				       sizeof(DWORD),       // size: low 32-bits
-				       "timermem");         // name of map object
+	/*hMapObject = CreateFileMapping((HANDLE) 0xFFFFFFFF,  /* use paging file */
+				       NULL,                /* no security attributes */
+				       PAGE_READWRITE,      /* read/write access */
+				       0,                   /* size: high 32-bits */
+				       sizeof(DWORD),       /* size: low 32-bits */
+				       "timermem");         /* name of map object */
 	*/
 	hMapObject = CreateFileMapping((HANDLE) 0xFFFFFFFF,
 								   NULL,