[Amsn-commits] SF.net SVN: amsn:[12045] trunk/amsn/utils/macosx/statusicon

[<kak...@us...>]

Revision: 12045
          http://amsn.svn.sourceforge.net/amsn/?rev=12045&view=rev
Author:   kakaroto
Date:     2010-05-28 22:25:07 +0000 (Fri, 28 May 2010)

Log Message:
-----------
Add proper copyright header information and code cleaning to statusicon

Modified Paths:
--------------
    trunk/amsn/utils/macosx/statusicon/statusicon-quartz.h
    trunk/amsn/utils/macosx/statusicon/statusicon-quartz.m
    trunk/amsn/utils/macosx/statusicon/statusicon.h
    trunk/amsn/utils/macosx/statusicon/statusicon.m

Modified: trunk/amsn/utils/macosx/statusicon/statusicon-quartz.h
===================================================================
--- trunk/amsn/utils/macosx/statusicon/statusicon-quartz.h	2010-05-28 15:36:40 UTC (rev 12044)
+++ trunk/amsn/utils/macosx/statusicon/statusicon-quartz.h	2010-05-28 22:25:07 UTC (rev 12045)
@@ -1,4 +1,31 @@
+/* statusicon-quartz.h:
+ *
+ * Copyright (C) 2006 Imendio AB
+ * Copyright (C) 2010 Youness Alaoui
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * GCC on Mac OS X handles inlined objective C in C-files.
+ *
+ * Authors:
+ *  Mikael Hallendal <mi...@im...>
+ *  Youness Alaoui
+ */
 
+
 #import <Cocoa/Cocoa.h>
 
 @interface QuartzStatusIcon : NSObject

Modified: trunk/amsn/utils/macosx/statusicon/statusicon-quartz.m
===================================================================
--- trunk/amsn/utils/macosx/statusicon/statusicon-quartz.m	2010-05-28 15:36:40 UTC (rev 12044)
+++ trunk/amsn/utils/macosx/statusicon/statusicon-quartz.m	2010-05-28 22:25:07 UTC (rev 12045)
@@ -1,6 +1,7 @@
 /* statusicon-quartz.c:
  *
  * Copyright (C) 2006 Imendio AB
+ * Copyright (C) 2010 Youness Alaoui
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -21,6 +22,7 @@
  *
  * Authors:
  *  Mikael Hallendal <mi...@im...>
+ *  Youness Alaoui
  */
 
 #include "statusicon-quartz.h"

Modified: trunk/amsn/utils/macosx/statusicon/statusicon.h
===================================================================
--- trunk/amsn/utils/macosx/statusicon/statusicon.h	2010-05-28 15:36:40 UTC (rev 12044)
+++ trunk/amsn/utils/macosx/statusicon/statusicon.h	2010-05-28 22:25:07 UTC (rev 12045)
@@ -1,3 +1,24 @@
+/* statusicon.h:
+ *
+ * Copyright (C) 2010 Youness Alaoui
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+
 #ifndef _STATUS_ICON
 #define _STATUS_ICON
 

Modified: trunk/amsn/utils/macosx/statusicon/statusicon.m
===================================================================
--- trunk/amsn/utils/macosx/statusicon/statusicon.m	2010-05-28 15:36:40 UTC (rev 12044)
+++ trunk/amsn/utils/macosx/statusicon/statusicon.m	2010-05-28 22:25:07 UTC (rev 12045)
@@ -1,7 +1,28 @@
+/* statusicon.c:
+ *
+ * Copyright (C) 2010 Youness Alaoui
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
 
+
 #include "statusicon.h"
 
-#define QUARTZ_POOL_ALLOC NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]
+#define QUARTZ_POOL_ALLOC NSAutoreleasePool *pool = \
+    [[NSAutoreleasePool alloc] init]
 #define QUARTZ_POOL_RELEASE [pool release]
 
 static int icon_counter = 0;
@@ -13,12 +34,15 @@
   Tcl_Obj *cb;
 } callback_s;
 
-int Statusicon_Create(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
+int Statusicon_Create(ClientData clientData, Tcl_Interp *interp,
+		      int objc, Tcl_Obj *CONST objv[])
 {
   char name[15];
   Tcl_HashEntry *hPtr = NULL;
   int newHash;
   callback_s *callback = NULL;
+  int ret = TCL_OK;
+  QuartzStatusIcon *status_item = NULL;
 
   if(objc != 2) {
     Tcl_WrongNumArgs(interp, 1, objv, "callback");
@@ -32,12 +56,12 @@
   callback->cb = objv[1];
   Tcl_IncrRefCount(callback->cb);
 
-  QuartzStatusIcon *status_item = [[QuartzStatusIcon alloc] initWithCallback:Statusicon_Callback andUserData:callback];
+  status_item = [[QuartzStatusIcon alloc] initWithCallback:Statusicon_Callback
+					       andUserData:callback];
   if (status_item == NULL) {
     Tcl_DecrRefCount(callback->cb);
     ckfree(callback);
-    QUARTZ_POOL_RELEASE;
-    return TCL_ERROR;
+    ret = TCL_ERROR;
   } else {
     sprintf(name, "statusicon%d", ++icon_counter);
 
@@ -50,15 +74,19 @@
     Tcl_ResetResult(interp);
     Tcl_AppendResult(interp, name, NULL);
   }
+
   QUARTZ_POOL_RELEASE;
 	
-  return TCL_OK;
+  return ret;
 }
 
-void Statusicon_Callback(QuartzStatusIcon *status_item, void *user_data, int doubleAction)
+void Statusicon_Callback(QuartzStatusIcon *status_item, void *user_data,
+			 int doubleAction)
 {
   callback_s * callback = (callback_s *) user_data;
-  Tcl_Obj *action = Tcl_NewStringObj(doubleAction ? "DOUBLE_ACTION" : "ACTION", -1);
+  Tcl_Obj *action = Tcl_NewStringObj(doubleAction ?
+				     "DOUBLE_ACTION" :
+				     "ACTION", -1);
   Tcl_Obj *eval = Tcl_NewStringObj("eval", -1);
   Tcl_Obj *command[] = {eval, callback->cb, action};
 
@@ -77,7 +105,8 @@
   
 }
 
-int Statusicon_SetImage(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
+int Statusicon_SetImage(ClientData clientData, Tcl_Interp *interp,
+			int objc, Tcl_Obj *CONST objv[])
 {
   QuartzStatusIcon *status_item;
   Tcl_HashEntry *hPtr = NULL;
@@ -110,7 +139,8 @@
   return TCL_OK;
 }
 
-int Statusicon_SetAlternateImage(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
+int Statusicon_SetAlternateImage(ClientData clientData, Tcl_Interp *interp,
+				 int objc, Tcl_Obj *CONST objv[])
 {
   QuartzStatusIcon *status_item;
   Tcl_HashEntry *hPtr = NULL;
@@ -143,7 +173,8 @@
   return TCL_OK;
 }
 
-int Statusicon_SetTooltip(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
+int Statusicon_SetTooltip(ClientData clientData, Tcl_Interp *interp,
+			  int objc, Tcl_Obj *CONST objv[])
 {
   QuartzStatusIcon *status_item;
   Tcl_HashEntry *hPtr = NULL;
@@ -176,7 +207,8 @@
   return TCL_OK;
 }
 
-int Statusicon_SetTitle(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
+int Statusicon_SetTitle(ClientData clientData, Tcl_Interp *interp,
+			int objc, Tcl_Obj *CONST objv[])
 {
   QuartzStatusIcon *status_item;
   Tcl_HashEntry *hPtr = NULL;
@@ -209,7 +241,8 @@
   return TCL_OK;
 }
 
-int Statusicon_SetHighlightMode(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
+int Statusicon_SetHighlightMode(ClientData clientData, Tcl_Interp *interp,
+				int objc, Tcl_Obj *CONST objv[])
 {
   QuartzStatusIcon *status_item;
   Tcl_HashEntry *hPtr = NULL;
@@ -243,7 +276,8 @@
 
   return TCL_OK;
 }
-int Statusicon_SetVisible(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
+int Statusicon_SetVisible(ClientData clientData, Tcl_Interp *interp,
+			  int objc, Tcl_Obj *CONST objv[])
 {
   QuartzStatusIcon *status_item;
   Tcl_HashEntry *hPtr = NULL;
@@ -278,7 +312,8 @@
   return TCL_OK;
 }
 
-int Statusicon_Destroy(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
+int Statusicon_Destroy(ClientData clientData, Tcl_Interp *interp,
+		       int objc, Tcl_Obj *CONST objv[])
 {
   QuartzStatusIcon *status_item;
   callback_s * callback = NULL;
@@ -337,14 +372,22 @@
   callbacks = (Tcl_HashTable *) ckalloc(sizeof(Tcl_HashTable));
   Tcl_InitHashTable(callbacks, TCL_STRING_KEYS);
 
-  Tcl_CreateObjCommand(interp, "::statusicon::create", Statusicon_Create, NULL, NULL);
-  Tcl_CreateObjCommand(interp, "::statusicon::setImage", Statusicon_SetImage, NULL, NULL);
-  Tcl_CreateObjCommand(interp, "::statusicon::setAlternateImage", Statusicon_SetAlternateImage, NULL, NULL);
-  Tcl_CreateObjCommand(interp, "::statusicon::setTooltip", Statusicon_SetTooltip, NULL, NULL);
-  Tcl_CreateObjCommand(interp, "::statusicon::setTitle", Statusicon_SetTitle, NULL, NULL);
-  Tcl_CreateObjCommand(interp, "::statusicon::setHighlightMode", Statusicon_SetHighlightMode, NULL, NULL);
-  Tcl_CreateObjCommand(interp, "::statusicon::setVisible", Statusicon_SetVisible, NULL, NULL);
-  Tcl_CreateObjCommand(interp, "::statusicon::destroy", Statusicon_Destroy, NULL, NULL);
+  Tcl_CreateObjCommand(interp, "::statusicon::create",
+		       Statusicon_Create, NULL, NULL);
+  Tcl_CreateObjCommand(interp, "::statusicon::setImage",
+		       Statusicon_SetImage, NULL, NULL);
+  Tcl_CreateObjCommand(interp, "::statusicon::setAlternateImage",
+		       Statusicon_SetAlternateImage, NULL, NULL);
+  Tcl_CreateObjCommand(interp, "::statusicon::setTooltip",
+		       Statusicon_SetTooltip, NULL, NULL);
+  Tcl_CreateObjCommand(interp, "::statusicon::setTitle",
+		       Statusicon_SetTitle, NULL, NULL);
+  Tcl_CreateObjCommand(interp, "::statusicon::setHighlightMode",
+		       Statusicon_SetHighlightMode, NULL, NULL);
+  Tcl_CreateObjCommand(interp, "::statusicon::setVisible",
+		       Statusicon_SetVisible, NULL, NULL);
+  Tcl_CreateObjCommand(interp, "::statusicon::destroy",
+		       Statusicon_Destroy, NULL, NULL);
   
 
   return Tcl_PkgProvide(interp, "statusicon", "0.1");


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