[GNUnet-SVN] r3969 - in gnunet-gtk/src: common plugins/daemon plugins/fs

[grothoff]

Author: grothoff
Date: 2006-12-17 17:56:58 -0800 (Sun, 17 Dec 2006)
New Revision: 3969

Modified:
   gnunet-gtk/src/common/helper.c
   gnunet-gtk/src/common/iterators.c
   gnunet-gtk/src/common/logging.c
   gnunet-gtk/src/plugins/daemon/daemon.c
   gnunet-gtk/src/plugins/fs/download.c
   gnunet-gtk/src/plugins/fs/meta.c
   gnunet-gtk/src/plugins/fs/upload.c
Log:
whitespace

Modified: gnunet-gtk/src/common/helper.c
===================================================================
--- gnunet-gtk/src/common/helper.c      2006-12-18 01:56:39 UTC (rev 3968)
+++ gnunet-gtk/src/common/helper.c      2006-12-18 01:56:58 UTC (rev 3969)
@@ -547,18 +547,18 @@
 #ifdef WITH_LIBGKSU2
   GError *gerror = NULL;
   if(run_wizard) {
-    code = gksu_run("gnunet-setup -d wizard-gtk", 
-                   &gerror); 
+    code = gksu_run("gnunet-setup -d wizard-gtk",
+                   &gerror);
   } else {
-    code = gksu_run("gnunet-setup -d", 
-                   &gerror); 
+    code = gksu_run("gnunet-setup -d",
+                   &gerror);
   }
   if (code && !gerror) {
-    error_message = STRDUP(_("GKSu encountered an unknown error running the 
configuration tool (gnunet-setup).")); 
+    error_message = STRDUP(_("GKSu encountered an unknown error running the 
configuration tool (gnunet-setup)."));
   } else if (code && gerror) {
-    error_message = g_strdup_printf(_("GKSu returned:\n%s"), 
+    error_message = g_strdup_printf(_("GKSu returned:\n%s"),
                                    gerror->message);
-    g_error_free(gerror); 
+    g_error_free(gerror);
   } else {
     error_message = NULL;
   }
@@ -574,7 +574,7 @@
                                    "mainWindow");
   messageDialog = gtk_message_dialog_new(GTK_WINDOW(mainWindow),
                                         GTK_DIALOG_MODAL | 
GTK_DIALOG_DESTROY_WITH_PARENT,
-                                        GTK_MESSAGE_WARNING, 
+                                        GTK_MESSAGE_WARNING,
                                         GTK_BUTTONS_CLOSE,
                                         _("Failed to run the configuration 
tool (gnunet-setup): %s"),
                                         error_message);

Modified: gnunet-gtk/src/common/iterators.c
===================================================================
--- gnunet-gtk/src/common/iterators.c   2006-12-18 01:56:39 UTC (rev 3968)
+++ gnunet-gtk/src/common/iterators.c   2006-12-18 01:56:58 UTC (rev 3969)
@@ -98,7 +98,7 @@
                                                   path);
   return FALSE;
 }
-              
+       
 
 /**
  * Identical to "gtk_tree_model_foreach",

Modified: gnunet-gtk/src/common/logging.c
===================================================================
--- gnunet-gtk/src/common/logging.c     2006-12-18 01:56:39 UTC (rev 3968)
+++ gnunet-gtk/src/common/logging.c     2006-12-18 01:56:58 UTC (rev 3969)
@@ -37,7 +37,7 @@
 static GladeXML * statusXML;
 
 static void init() {
-  if (statusXML != NULL) 
+  if (statusXML != NULL)
     return;
   statusXML
     = glade_xml_new(getGladeFileName(),

Modified: gnunet-gtk/src/plugins/daemon/daemon.c
===================================================================
--- gnunet-gtk/src/plugins/daemon/daemon.c      2006-12-18 01:56:39 UTC (rev 
3968)
+++ gnunet-gtk/src/plugins/daemon/daemon.c      2006-12-18 01:56:58 UTC (rev 
3969)
@@ -144,7 +144,7 @@
     statsEntryError
       = glade_xml_get_widget(getMainXML(),
                             "statusPixmapError");
-    chooser 
+    chooser
       = glade_xml_get_widget(getMainXML(),
                             "gnunetdconfigFileChooserButton");
     GC_get_configuration_value_string(cfg,
@@ -186,9 +186,9 @@
        }
        FREE(user);
        GC_free(dcfg);
-      }    
+      }
       g_free(fn);
-    } 
+    }
     gtk_widget_hide(statsEntryYes);
     gtk_widget_set_sensitive(killEntry, FALSE);
     if (canStart && isLocal) {
@@ -218,7 +218,7 @@
     ret = 1;
   else
     ret = 0;
-  gtkSaveCall(&doUpdateMenus, &ret);  
+  gtkSaveCall(&doUpdateMenus, &ret);
 }
 
 
@@ -230,7 +230,7 @@
   GtkWidget * launchEntry;
   GtkWidget * chooser;
   char * fn;
- 
+
   launchEntry
     = glade_xml_get_widget(getMainXML(),
                           "startDaemon");
@@ -241,14 +241,14 @@
     return;
   } else {     
     addLogEntry(_("Launching gnunetd..."));
-    chooser 
+    chooser
       = glade_xml_get_widget(getMainXML(),
                             "gnunetdconfigFileChooserButton");
     fn = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(chooser));
     GE_BREAK(ectx, fn != NULL);
     if (SYSERR != os_daemon_start(ectx,
                                  cfg,
-                                 fn, 
+                                 fn,
                                  YES)) {
       addLogEntry(_("Launched gnunetd"));
     } else {
@@ -353,7 +353,7 @@
                daemon_config);
   }
   FREE(daemon_config);
-  
+
   cron = cron_create(ectx);
   cron_add_job(cron,
               &cronCheckDaemon,

Modified: gnunet-gtk/src/plugins/fs/download.c
===================================================================
--- gnunet-gtk/src/plugins/fs/download.c        2006-12-18 01:56:39 UTC (rev 
3968)
+++ gnunet-gtk/src/plugins/fs/download.c        2006-12-18 01:56:58 UTC (rev 
3969)
@@ -111,14 +111,14 @@
     return;
 
   if (0 != stat(list->filename,
-               &buf)) 
+               &buf))
     return;
   if (S_ISDIR(buf.st_mode)) {
     fn = MALLOC(strlen(list->filename) + strlen(GNUNET_DIRECTORY_EXT) + 1);
     strcpy(fn, list->filename);
-    if (fn[strlen(fn)-1] == '/') 
+    if (fn[strlen(fn)-1] == '/')
       fn[strlen(fn)-1] = '\0';
-    strcat(fn, GNUNET_DIRECTORY_EXT);   
+    strcat(fn, GNUNET_DIRECTORY_EXT);
     if (0 != stat(list->filename,
                  &buf)) {
       FREE(fn);
@@ -453,10 +453,10 @@
       valid = gtk_tree_model_iter_children(model,
                                           &iter,
                                           &piter);
-      while (TRUE == valid) 
+      while (TRUE == valid)
        valid = gtk_tree_store_remove(GTK_TREE_STORE(model),
                                      &iter);
-    }    
+    }
   }
   if (list->searchViewRowReference != NULL) {
     gtk_tree_row_reference_free(list->searchViewRowReference);
@@ -602,7 +602,7 @@
   if (idc_name == NULL) {
 #ifdef WINDOWS
     char * filehash;
-    
+
     filehash = STRDUP(sdc.uri_name);
     filehash[16] = 0;
     idc_name = STRDUP(filehash);
@@ -612,7 +612,7 @@
 #endif
   }
 
-  /* dname = directory portion of idc_name */  
+  /* dname = directory portion of idc_name */
   cname = idc_name;
   dname = STRDUP(idc_name);
   cname = &dname[strlen(dname)-1];
@@ -684,14 +684,14 @@
   sdc.idc_final_download_destination = MALLOC(strlen(final_download_dir) + 2 +
                                              strlen(idc_name) + 
strlen(GNUNET_DIRECTORY_EXT) +
                                              strlen(dirPath));
-  strcpy(sdc.idc_final_download_destination, 
+  strcpy(sdc.idc_final_download_destination,
         final_download_dir);
   if 
(sdc.idc_final_download_destination[strlen(sdc.idc_final_download_destination)-1]
 != DIR_SEPARATOR)
     strcat(sdc.idc_final_download_destination,
            DIR_SEPARATOR_STR);
-  strcat(sdc.idc_final_download_destination, 
+  strcat(sdc.idc_final_download_destination,
         dirPath);
-  strcat(sdc.idc_final_download_destination, 
+  strcat(sdc.idc_final_download_destination,
         idc_name);
   sdc.anonymity = getSpinButtonValue(sdc.searchContext->searchXML,
                                     "downloadAnonymitySpinButton");
@@ -777,21 +777,21 @@
   disk_directory_create(ectx, final_download_dir);
   dname = &uris[strlen(ECRS_URI_PREFIX) + strlen(ECRS_FILE_INFIX)];
   sdc.idc_final_download_destination = MALLOC(strlen(final_download_dir) + 
strlen(dname) + 2);
-  strcpy(sdc.idc_final_download_destination, 
+  strcpy(sdc.idc_final_download_destination,
         final_download_dir);
   FREE(final_download_dir);
   if 
(sdc.idc_final_download_destination[strlen(sdc.idc_final_download_destination)] 
!= DIR_SEPARATOR)
-    strcat(sdc.idc_final_download_destination, 
+    strcat(sdc.idc_final_download_destination,
           DIR_SEPARATOR_STR);
   strcat(sdc.idc_final_download_destination,
         dname);
 
-  addLogEntry(_("Downloading `%s'"), 
+  addLogEntry(_("Downloading `%s'"),
              uris);
   sdc.idc_meta = ECRS_createMetaData();
   sdc.anonymity = getSpinButtonValue(getMainXML(),
                                     "fsstatusAnonymitySpin");
-  sdc.recursive = NO; 
+  sdc.recursive = NO;
   sdc.searchContext = NULL;
   sdc.parentContext = NULL;
   run_with_save_calls(&init_download_helper,

Modified: gnunet-gtk/src/plugins/fs/meta.c
===================================================================
--- gnunet-gtk/src/plugins/fs/meta.c    2006-12-18 01:56:39 UTC (rev 3968)
+++ gnunet-gtk/src/plugins/fs/meta.c    2006-12-18 01:56:58 UTC (rev 3969)
@@ -330,7 +330,7 @@
   ggc_tree_selection_selected_foreach
     (gtk_tree_view_get_selection(GTK_TREE_VIEW(list)),
      &removeRow,
-     NULL);  
+     NULL);
 }
 
 #define THUMBSIZE 128
@@ -385,7 +385,7 @@
       return meta;
     height = gdk_pixbuf_get_height(pixbuf);
     width = gdk_pixbuf_get_width(pixbuf);
-    if ( (height > THUMBSIZE) || 
+    if ( (height > THUMBSIZE) ||
         (width > THUMBSIZE) ) {
       if (height > THUMBSIZE) {
        width = width * THUMBSIZE / height;
@@ -622,7 +622,7 @@
                               const char * widgetName) {
   GtkBin * line;
   GtkEntry * entry;
-  
+
   line = GTK_BIN(glade_xml_get_widget(xml,
                                      widgetName));
   entry = GTK_ENTRY(gtk_bin_get_child(line));

Modified: gnunet-gtk/src/plugins/fs/upload.c
===================================================================
--- gnunet-gtk/src/plugins/fs/upload.c  2006-12-18 01:56:39 UTC (rev 3968)
+++ gnunet-gtk/src/plugins/fs/upload.c  2006-12-18 01:56:58 UTC (rev 3969)
@@ -142,7 +142,7 @@
   GtkTreePath * path;
   int progress;
   GtkTreeIter par;
-    
+
   ret = MALLOC(sizeof(UploadList));
   memset(ret,
         0,
@@ -163,7 +163,7 @@
     gtk_tree_store_append(upload_summary,
                          &iter,
                          NULL);
-  }  
+  }
   if (total != 0)
     progress = 100 * completed / total;
   else
@@ -329,7 +329,7 @@
 
 static void * start_upload_helper(void * cls) {
   FSUC * fsuc = cls;
-  
+
   FSUI_startUpload(ctx,
                   fsuc->filename,
                   (DirectoryScanCallback) &disk_directory_scan,
@@ -583,7 +583,7 @@
   filename = getEntryLineValue(getMainXML(),
                               "uploadFilenameComboBoxEntry");
   ok = (0 == stat(filename, &buf));
-  if (ok)  
+  if (ok)
     ok = (0 == ACCESS(filename, R_OK));
   if (ok) {
     if (S_ISDIR(buf.st_mode)) {