fix possible compile issues: C++ comments, non-int function

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 8f59cf2fded90f7b191086f1c3618b79451a682a..b98d602a6555a8d656aa321486af7b35193c322a 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,13 @@
+2003-05-03 [thorsten]  0.8.11claws140
+
+       * src/addrquery.h
+         src/ldapquery.h
+         src/mainwindow.c
+               removed C++ comments
+       * src/addr_compl.c
+               function with non-int retval/param used before
+               implementation/declaration
+
 2003-05-02 [paul]      0.8.11claws139
 
        * src/addr_compl.[ch]

diff --git a/src/addr_compl.c b/src/addr_compl.c
index 959f66ed90ac6d5b90b4ff7643be9c5d553359e1..e2858f068be3263dc85f5dbdb19a101726dceb71 100644 (file)
--- a/src/addr_compl.c
+++ b/src/addr_compl.c
@@ -187,6 +187,22 @@ static void read_address_book(void) {
        g_completion_list = g_list_reverse(g_completion_list);
 }
 
+/* should clear up anything after complete_address() */
+void clear_completion_cache(void)
+{
+       if (is_completion_pending()) {
+               if (g_completion_prefix)
+                       g_free(g_completion_prefix);
+
+               if (g_completion_addresses) {
+                       g_slist_free(g_completion_addresses);
+                       g_completion_addresses = NULL;
+               }
+
+               g_completion_count = g_completion_next = 0;
+       }
+}
+
 /* start_address_completion() - returns the number of addresses 
  * that should be matched for completion.
  */
@@ -413,22 +429,6 @@ guint get_completion_count(void)
                return 0;
 }
 
-/* should clear up anything after complete_address() */
-void clear_completion_cache(void)
-{
-       if (is_completion_pending()) {
-               if (g_completion_prefix)
-                       g_free(g_completion_prefix);
-
-               if (g_completion_addresses) {
-                       g_slist_free(g_completion_addresses);
-                       g_completion_addresses = NULL;
-               }
-
-               g_completion_count = g_completion_next = 0;
-       }
-}
-
 gboolean is_completion_pending(void)
 {
        /* check if completion pending, i.e. we might satisfy a request for the next

diff --git a/src/addrquery.h b/src/addrquery.h
index aa68aabf105e545d4afdde785b25ba883dbbf744..f496dcb34e50d0c2ae6a126a8f48869603bb3bb5 100644 (file)
--- a/src/addrquery.h
+++ b/src/addrquery.h
@@ -25,7 +25,7 @@
 #define __ADDRQUERY_H__
 
 #include <glib.h>
-// #include <stdio.h>
+/* #include <stdio.h> */
 
 /* Address search call back function */
 typedef gint ( AddrSearchCallbackFunc ) ( gint cacheID,

diff --git a/src/ldapquery.h b/src/ldapquery.h
index 0ae878be3b35fac20f5e2c78d72fb16baeca6f59..90da502af5d27484c7399ded6287dcf677ddd802 100644 (file)
--- a/src/ldapquery.h
+++ b/src/ldapquery.h
@@ -77,7 +77,7 @@ struct _LdapQuery {
        void        (*callBackEnd)( void * );
        ItemFolder  *folder;            /* Reference to folder in cache */
        LdapServer  *server;            /* Reference to (parent) LDAP server */
-       // SyldapServer *server;                /* Reference to (parent) LDAP server */
+       /* SyldapServer *server; */             /* Reference to (parent) LDAP server */
 };
 
 /* Function prototypes */

diff --git a/src/mainwindow.c b/src/mainwindow.c
index 783610a9600db2d295e28c76805d4ba1f9ecef01..ba0be58fa9c7561039fa8eb8adfe0a15538852aa 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -1199,7 +1199,7 @@ void main_window_separation_change(MainWindow *mainwin, SeparateType type)
 {
        GtkWidget *folder_wid  = GTK_WIDGET_PTR(mainwin->folderview);
        GtkWidget *summary_wid = GTK_WIDGET_PTR(mainwin->summaryview);
-       //GtkWidget *message_wid = GTK_WIDGET_PTR(mainwin->messageview);
+       /* GtkWidget *message_wid = GTK_WIDGET_PTR(mainwin->messageview); */
        GtkWidget *message_wid = mainwin->messageview->vbox;
 
        debug_print("Changing window separation type from %d to %d\n",

diff --git a/src/passphrase.c b/src/passphrase.c
index 55fe5d05df03af6d0c919f1470164fca77c44e99..3bdae4e04d3540657d84ca97671fbc3306d23f4c 100644 (file)
--- a/src/passphrase.c
+++ b/src/passphrase.c
@@ -321,7 +321,7 @@ gpgmegtk_passphrase_cb (void *opaque, const char *desc, void **r_hd)
 
 void gpgmegtk_free_passphrase()
 {
-    (void)free_passphrase(NULL); // could be inline
+    (void)free_passphrase(NULL); /* could be inline */
 }
 
 #endif /* USE_GPGME */