[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r3728 - in gnunet-gtk/src: common core include plugins/daem
|
From: |
grothoff |
|
Subject: |
[GNUnet-SVN] r3728 - in gnunet-gtk/src: common core include plugins/daemon plugins/fs plugins/stats |
|
Date: |
Sun, 12 Nov 2006 01:01:16 -0800 (PST) |
Author: grothoff
Date: 2006-11-12 01:01:00 -0800 (Sun, 12 Nov 2006)
New Revision: 3728
Modified:
gnunet-gtk/src/common/helper.c
gnunet-gtk/src/core/eggtrayicon.c
gnunet-gtk/src/core/main.c
gnunet-gtk/src/include/gnunetgtk_common.h
gnunet-gtk/src/plugins/daemon/daemon.c
gnunet-gtk/src/plugins/fs/download.c
gnunet-gtk/src/plugins/fs/fs.c
gnunet-gtk/src/plugins/fs/fs.h
gnunet-gtk/src/plugins/fs/helper.h
gnunet-gtk/src/plugins/fs/meta.c
gnunet-gtk/src/plugins/fs/meta.h
gnunet-gtk/src/plugins/fs/namespace.c
gnunet-gtk/src/plugins/fs/search.c
gnunet-gtk/src/plugins/fs/search.h
gnunet-gtk/src/plugins/fs/upload.c
gnunet-gtk/src/plugins/fs/upload.h
gnunet-gtk/src/plugins/stats/functions.c
gnunet-gtk/src/plugins/stats/statistics.c
Log:
removing whitespace
Modified: gnunet-gtk/src/common/helper.c
===================================================================
--- gnunet-gtk/src/common/helper.c 2006-11-12 08:58:46 UTC (rev 3727)
+++ gnunet-gtk/src/common/helper.c 2006-11-12 09:01:00 UTC (rev 3728)
@@ -286,7 +286,7 @@
if ( (module == NULL) ||
(TRUE != g_module_symbol(module,
handler_name,
- &method)) ) {
+ &method)) ) {
GE_LOG(ectx,
GE_WARNING | GE_DEVELOPER | GE_IMMEDIATE,
_("Failed to find handler for `%s'\n"),
@@ -320,8 +320,8 @@
lib = os_plugin_load(ectx,
"libgnunetgtkmodule_",
name);
- if (lib == NULL)
- return;
+ if (lib == NULL)
+ return;
p = MALLOC(sizeof(Plugin));
p->name = STRDUP(name);
p->next = plugin;
@@ -357,8 +357,8 @@
*next = '\0'; /* add 0-termination for pos */
next++;
}
- if (strlen(pos) > 0)
- loadPlugin(pos);
+ if (strlen(pos) > 0)
+ loadPlugin(pos);
} while (next != NULL);
FREE(dup);
}
@@ -404,7 +404,7 @@
gladeFile = STRDUP(filename);
#endif
FREE(filename);
-
+
mainXML = glade_xml_new(gladeFile,
"mainWindow",
PACKAGE_NAME);
@@ -540,30 +540,30 @@
*
*/
void gnunetgtk_notify(int type,
- const char *message,
+ const char *message,
...) {
#ifdef WITH_LIBNOTIFY
static int once;
char * msg;
size_t size;
va_list arg;
- GtkWidget * root;
+ GtkWidget * root;
NotifyNotification *libnotify;
NotifyUrgency libnotify_urgency = NOTIFY_URGENCY_NORMAL;
long libnotify_expire_timeout = NOTIFY_EXPIRES_DEFAULT;
if (! notify_is_initted()){
if (once == 1)
- return;
+ return;
if (! notify_init ("gnunet-gtk")) {
once = 1;
GE_LOG(ectx,
GE_WARNING | GE_BULK | GE_USER | GE_ADMIN,
- _("Could not initialize libnotify\n"));
+ _("Could not initialize libnotify\n"));
return;
}
}
-
+
root = glade_xml_get_widget(getMainXML(),"mainWindow");
if (gtk_window_is_active(GTK_WINDOW(root)) == FALSE) {
if (type == NOTIFY_LOW)
@@ -611,7 +611,7 @@
end = NULL;
if (TRUE == g_utf8_validate(msg,
-1,
- &end))
+ &end))
return msg;
/* hope that it is ISO8859-1 */
ret = g_convert_with_fallback(msg,
@@ -707,17 +707,17 @@
selected = gtk_tree_selection_get_selected_rows(selection,
&model);
-
+
i = g_list_length(selected);
size = 0;
refs = NULL;
GROW(refs,
size,
i);
- for (i=0;i<size;i++)
+ for (i=0;i<size;i++)
refs[i] = gtk_tree_row_reference_new(model,
g_list_nth_data(selected, i));
- g_list_foreach(selected,
+ g_list_foreach(selected,
(GFunc) >k_tree_path_free,
NULL);
g_list_free(selected);
@@ -726,12 +726,12 @@
gtk_tree_row_reference_free(refs[i]);
if (TRUE == gtk_tree_model_get_iter(model,
&iter,
- path))
+ path))
func(model,
path,
&iter,
data);
- gtk_tree_path_free(path);
+ gtk_tree_path_free(path);
}
GROW(refs,
size,
Modified: gnunet-gtk/src/core/eggtrayicon.c
===================================================================
--- gnunet-gtk/src/core/eggtrayicon.c 2006-11-12 08:58:46 UTC (rev 3727)
+++ gnunet-gtk/src/core/eggtrayicon.c 2006-11-12 09:01:00 UTC (rev 3728)
@@ -71,7 +71,7 @@
GtkPlug parent_instance;
guint stamp;
-
+
Atom selection_atom;
Atom manager_atom;
Atom system_tray_opcode_atom;
@@ -107,7 +107,7 @@
static gboolean tray_clicked (GtkWidget *trayContextMenu, GdkEvent *event);
static gboolean on_tray_quit_activate(GtkWidget *widget, GdkEvent *event,
gpointer data);
-
+
G_END_DECLS
#define SYSTEM_TRAY_REQUEST_DOCK 0
@@ -121,7 +121,7 @@
PROP_0,
PROP_ORIENTATION
};
-
+
static GtkPlugClass *parent_class = NULL;
static void egg_tray_icon_init (EggTrayIcon *icon);
@@ -198,7 +198,7 @@
{
icon->stamp = 1;
icon->orientation = GTK_ORIENTATION_HORIZONTAL;
-
+
gtk_widget_add_events (GTK_WIDGET (icon), GDK_PROPERTY_CHANGE_MASK);
}
@@ -320,7 +320,7 @@
egg_tray_icon_manager_window_destroyed (icon);
}
}
-
+
return GDK_FILTER_CONTINUE;
}
@@ -360,7 +360,7 @@
{
XClientMessageEvent ev;
Display *display;
-
+
ev.type = ClientMessage;
ev.window = window;
ev.message_type = icon->system_tray_opcode_atom;
@@ -395,13 +395,13 @@
gboolean dock_if_realized)
{
Display *xdisplay;
-
+
if (icon->manager_window != None)
return;
xdisplay = getDisplay(GTK_WIDGET (icon));
XGrabServer (xdisplay);
-
+
icon->manager_window = XGetSelectionOwner (xdisplay,
icon->selection_atom);
@@ -411,7 +411,7 @@
XUngrabServer (xdisplay);
XFlush (xdisplay);
-
+
if (icon->manager_window != None)
{
GdkWindow *gdkwin;
@@ -430,7 +430,7 @@
egg_tray_icon_manager_window_destroyed (EggTrayIcon *icon)
{
GdkWindow *gdkwin;
-
+
g_return_if_fail (icon->manager_window != None);
gdkwin = getWindow(icon);
@@ -467,9 +467,9 @@
screen);
icon->selection_atom = XInternAtom (xdisplay, buffer, False);
-
+
icon->manager_atom = XInternAtom (xdisplay, "MANAGER", False);
-
+
icon->system_tray_opcode_atom = XInternAtom (xdisplay,
"_NET_SYSTEM_TRAY_OPCODE",
False);
@@ -515,11 +515,11 @@
gint len)
{
guint stamp;
-
+
g_return_val_if_fail (EGG_IS_TRAY_ICON (icon), 0);
g_return_val_if_fail (timeout >= 0, 0);
g_return_val_if_fail (message != NULL, 0);
-
+
if (icon->manager_window == None)
return 0;
@@ -527,7 +527,7 @@
len = strlen (message);
stamp = icon->stamp++;
-
+
/* Get ready to send the message */
egg_tray_icon_send_manager_message (icon, SYSTEM_TRAY_BEGIN_MESSAGE,
(Window)gtk_plug_get_id (GTK_PLUG (icon)),
@@ -574,7 +574,7 @@
{
g_return_if_fail (EGG_IS_TRAY_ICON (icon));
g_return_if_fail (id > 0);
-
+
egg_tray_icon_send_manager_message (icon, SYSTEM_TRAY_CANCEL_MESSAGE,
(Window)gtk_plug_get_id (GTK_PLUG (icon)),
id, 0, 0);
@@ -627,7 +627,7 @@
}
/* Initiate the system tray icon */
-void initTrayIcon() {
+void initTrayIcon() {
static EggTrayIcon *tray_icon;
static GtkWidget *tray_icon_image;
static GtkTooltips *tray_icon_tooltip;
Modified: gnunet-gtk/src/core/main.c
===================================================================
--- gnunet-gtk/src/core/main.c 2006-11-12 08:58:46 UTC (rev 3727)
+++ gnunet-gtk/src/core/main.c 2006-11-12 09:01:00 UTC (rev 3728)
@@ -46,11 +46,11 @@
#ifdef WINDOWS
{ 'd', "debug", NULL,
gettext_noop("run in debug mode"),
- 0, &gnunet_getopt_configure_set_one, &debug_mode },
+ 0, &gnunet_getopt_configure_set_one, &debug_mode },
#endif
COMMAND_LINE_OPTION_HELP(gettext_noop("GNUnet GTK user interface.")), /* -h
*/
COMMAND_LINE_OPTION_HOSTNAME, /* -H */
- COMMAND_LINE_OPTION_LOGGING, /* -L */
+ COMMAND_LINE_OPTION_LOGGING, /* -L */
COMMAND_LINE_OPTION_VERSION(VERSION), /* -v */
COMMAND_LINE_OPTION_VERBOSE,
COMMAND_LINE_OPTION_END,
@@ -96,7 +96,7 @@
&cfg);
if (i == -1) {
GNUNET_fini(ectx, cfg);
- return -1;
+ return -1;
}
#ifdef WINDOWS
if (!debug_mode)
Modified: gnunet-gtk/src/include/gnunetgtk_common.h
===================================================================
--- gnunet-gtk/src/include/gnunetgtk_common.h 2006-11-12 08:58:46 UTC (rev
3727)
+++ gnunet-gtk/src/include/gnunetgtk_common.h 2006-11-12 09:01:00 UTC (rev
3728)
@@ -111,7 +111,7 @@
* Sends a message to libnotify
*/
void gnunetgtk_notify(int type,
- const char * message,
+ const char * message,
...);
/**
Modified: gnunet-gtk/src/plugins/daemon/daemon.c
===================================================================
--- gnunet-gtk/src/plugins/daemon/daemon.c 2006-11-12 08:58:46 UTC (rev
3727)
+++ gnunet-gtk/src/plugins/daemon/daemon.c 2006-11-12 09:01:00 UTC (rev
3728)
@@ -56,7 +56,7 @@
G_TYPE_STRING);
apps = NULL;
sock = client_connection_create(ectx, cfg);
- if (sock != NULL)
+ if (sock != NULL)
apps = getConfigurationOptionValue(sock,
"GNUNETD",
"APPLICATIONS");
Modified: gnunet-gtk/src/plugins/fs/download.c
===================================================================
--- gnunet-gtk/src/plugins/fs/download.c 2006-11-12 08:58:46 UTC (rev
3727)
+++ gnunet-gtk/src/plugins/fs/download.c 2006-11-12 09:01:00 UTC (rev
3728)
@@ -33,12 +33,12 @@
/* ****************** FSUI download events ****************** */
/**
- * We are iterating over the contents of a
+ * We are iterating over the contents of a
* directory. Add the list of entries to
* the search page at the position indicated
* by the download list.
*/
-static int
+static int
addFilesToDirectory(const ECRS_FileInfo * fi,
const HashCode512 * key,
int isRoot,
@@ -50,7 +50,7 @@
GtkTreePath * path;
GtkTreeModel * model;
- if (isRoot == YES)
+ if (isRoot == YES)
return OK;
if (! gtk_tree_row_reference_valid(list->searchViewRowReference))
return SYSERR;
@@ -91,7 +91,7 @@
return OK;
}
-static void
+static void
refreshDirectoryViewFromDisk(DownloadList * list) {
unsigned long long size;
char * data;
@@ -101,18 +101,18 @@
if ( (list->is_directory != YES) ||
(list->searchList == NULL) ||
(list->searchViewRowReference == NULL) ||
- (! gtk_tree_row_reference_valid(list->searchViewRowReference)) )
+ (! gtk_tree_row_reference_valid(list->searchViewRowReference)) )
return;
-
+
if (OK != disk_file_size(ectx,
list->filename,
&size,
- YES))
- return;
+ YES))
+ return;
fd = disk_file_open(ectx,
- list->filename,
+ list->filename,
O_RDONLY);
- if (fd == -1)
+ if (fd == -1)
return;
data = MMAP(NULL,
size,
@@ -168,7 +168,7 @@
char * uri_name;
gboolean valid;
struct ECRS_URI * u;
-
+
/* setup visualization */
list = MALLOC(sizeof(DownloadList));
memset(list,
@@ -201,7 +201,7 @@
DOWNLOAD_HSIZE, size_h,
DOWNLOAD_PROGRESS, progress,
DOWNLOAD_URISTRING, uri_name,
- DOWNLOAD_INTERNAL, list,
+ DOWNLOAD_INTERNAL, list,
-1);
FREE(uri_name);
FREE(size_h);
@@ -221,16 +221,16 @@
path =
gtk_tree_row_reference_get_path(dl_parent->searchViewRowReference);
valid = gtk_tree_model_get_iter(GTK_TREE_MODEL(sl_parent->tree),
&piter,
- path);
+ path);
if (valid == TRUE)
valid = gtk_tree_model_iter_children(GTK_TREE_MODEL(sl_parent->tree),
&iter,
- &piter);
+ &piter);
} else {
/* must be top-level entry in search */
valid = gtk_tree_model_get_iter_first(GTK_TREE_MODEL(sl_parent->tree),
&iter);
- }
+ }
if (valid == TRUE) {
valid = FALSE;
/* find matching entry */
@@ -271,7 +271,7 @@
list->next = download_head;
download_head = list;
if ( (list->is_directory == YES) &&
- (completed != 0) )
+ (completed != 0) )
refreshDirectoryViewFromDisk(list);
return list;
}
@@ -306,7 +306,7 @@
(list->searchList != NULL) &&
(list->searchViewRowReference != NULL) ) {
struct ECRS_MetaData * meta;
-
+
meta = NULL;
ECRS_listDirectory(ectx,
data,
@@ -353,17 +353,17 @@
&iter,
path);
gtk_tree_path_free(path);
- gtk_tree_row_reference_free(list->summaryViewRowReference);
+ gtk_tree_row_reference_free(list->summaryViewRowReference);
list->summaryViewRowReference = NULL;
gtk_tree_store_remove(download_summary,
&iter);
if (list->searchViewRowReference != NULL) {
- gtk_tree_row_reference_free(list->searchViewRowReference);
+ gtk_tree_row_reference_free(list->searchViewRowReference);
list->searchViewRowReference = NULL;
}
FREE(list->filename);
ECRS_freeUri(list->uri);
-
+
if (download_head == list)
download_head = list->next;
else {
@@ -388,7 +388,7 @@
*
* @return OK if no download is pending, SYSERR if
* such a download is already active.
- */
+ */
static int
check_pending(const char * filename,
GtkTreeIter * parent) {
@@ -421,7 +421,7 @@
* The user clicked the download button.
* Start the download of the selected entry.
*/
-static void
+static void
initiateDownload(GtkTreeModel * model,
GtkTreePath * path,
GtkTreeIter * iter,
@@ -485,7 +485,7 @@
#else
idc_name = uri_name;
#endif
- }
+ }
cname = idc_name;
oname = idc_name;
dname = MALLOC(strlen(idc_name)+1);
@@ -570,12 +570,12 @@
strcat(idc_final_download_destination, idc_name);
if ( (idc_final_download_destination[strlen(idc_final_download_destination)
- 1] == '/') ||
(idc_final_download_destination[strlen(idc_final_download_destination)
- 1] == '\\') )
- idc_final_download_destination[strlen(idc_final_download_destination) - 1]
= '\0';
+ idc_final_download_destination[strlen(idc_final_download_destination) - 1]
= '\0';
/* append ".gnd" if needed (== directory and .gnd not present) */
- if ( (idc_mime != NULL) &&
+ if ( (idc_mime != NULL) &&
(0 == strcmp(idc_mime, GNUNET_DIRECTORY_MIME)) &&
( (strlen(idc_final_download_destination) <
strlen(GNUNET_DIRECTORY_EXT)) ||
- (0 !=
strcmp(&idc_final_download_destination[strlen(idc_final_download_destination)
+ (0 !=
strcmp(&idc_final_download_destination[strlen(idc_final_download_destination)
-
strlen(GNUNET_DIRECTORY_EXT)],
GNUNET_DIRECTORY_EXT)) ) )
strcat(idc_final_download_destination, GNUNET_DIRECTORY_EXT);
@@ -626,7 +626,7 @@
* that is NOT rooted within a search or directory.
*
* TODO:
- * - support for recursive downloads
+ * - support for recursive downloads
* - support for showing directories (if downloaded like this)
* - support for user-specified filename
*/
@@ -639,7 +639,7 @@
char * urid;
char * final_download_dir;
const char * dname;
-
+
uris = gtk_entry_get_text(GTK_ENTRY(entry));
urid = STRDUP(uris);
gtk_entry_set_text(GTK_ENTRY(entry),
@@ -703,7 +703,7 @@
return NULL;
}
-static gboolean
+static gboolean
clearCompletedDownloadCallback(GtkTreeModel * model,
GtkTreePath * path,
GtkTreeIter * iter,
@@ -727,13 +727,13 @@
}
void on_clearCompletedDownloadsButton_clicked_fs(void * unused,
- GtkWidget * clearButton) {
+ GtkWidget * clearButton) {
gtk_tree_model_foreach(GTK_TREE_MODEL(download_summary),
&clearCompletedDownloadCallback,
NULL);
}
-static void
+static void
fsuiCallDownloadCallback(GtkTreeModel * model,
GtkTreePath * path,
GtkTreeIter * iter,
Modified: gnunet-gtk/src/plugins/fs/fs.c
===================================================================
--- gnunet-gtk/src/plugins/fs/fs.c 2006-11-12 08:58:46 UTC (rev 3727)
+++ gnunet-gtk/src/plugins/fs/fs.c 2006-11-12 09:01:00 UTC (rev 3728)
@@ -195,7 +195,7 @@
return ret;
}
-static void *
+static void *
eventProcessor(void * unused,
const FSUI_Event * event) {
return gtkSaveCall(&saveEventProcessor,
@@ -204,7 +204,7 @@
/**
* Setup the summary views (in particular the models
- * and the renderers).
+ * and the renderers).
*/
static void fs_summary_start() {
GtkComboBoxEntry * searchCB;
@@ -221,7 +221,7 @@
searchCB
= GTK_COMBO_BOX_ENTRY(glade_xml_get_widget(getMainXML(),
"fssearchKeywordComboBoxEntry"));
-
+
model = gtk_list_store_new(NS_SEARCH_NUM,
G_TYPE_STRING, /* what we show */
G_TYPE_STRING, /* EncName of namespace */
@@ -314,7 +314,7 @@
renderer,
"text", DOWNLOAD_HSIZE,
NULL);
-
+
column = gtk_tree_view_get_column(downloadList,
col - 1);
gtk_tree_view_column_set_resizable(column, TRUE);
Modified: gnunet-gtk/src/plugins/fs/fs.h
===================================================================
--- gnunet-gtk/src/plugins/fs/fs.h 2006-11-12 08:58:46 UTC (rev 3727)
+++ gnunet-gtk/src/plugins/fs/fs.h 2006-11-12 09:01:00 UTC (rev 3728)
@@ -199,7 +199,7 @@
/**
* FSUI search handle.
*/
- struct FSUI_SearchList * fsui_list;
+ struct FSUI_SearchList * fsui_list;
} SearchList;
Modified: gnunet-gtk/src/plugins/fs/helper.h
===================================================================
--- gnunet-gtk/src/plugins/fs/helper.h 2006-11-12 08:58:46 UTC (rev 3727)
+++ gnunet-gtk/src/plugins/fs/helper.h 2006-11-12 09:01:00 UTC (rev 3728)
@@ -36,7 +36,7 @@
* @returns the created widget to pack into the page header
*/
GtkWidget *
-buildSearchTabLabel(GtkWidget *searchPage,
+buildSearchTabLabel(GtkWidget *searchPage,
const char *title);
Modified: gnunet-gtk/src/plugins/fs/meta.c
===================================================================
--- gnunet-gtk/src/plugins/fs/meta.c 2006-11-12 08:58:46 UTC (rev 3727)
+++ gnunet-gtk/src/plugins/fs/meta.c 2006-11-12 09:01:00 UTC (rev 3728)
@@ -172,7 +172,7 @@
GtkListStore * keymodel;
GtkCellRenderer * renderer;
GtkTreeViewColumn * column;
-
+
DEBUG_BEGIN();
keymodel
= gtk_list_store_new(1,
@@ -482,7 +482,7 @@
char * getMimeTypeFromMetaData(const struct ECRS_MetaData * meta) {
char * mime;
-
+
mime = ECRS_getFromMetaData(meta,
EXTRACTOR_MIMETYPE);
if (mime == NULL)
@@ -507,7 +507,7 @@
name = STRDUP(_("no name given"));
} else {
char * dotdot;
-
+
while (NULL != (dotdot = strstr(name, "..")))
dotdot[0] = dotdot[1] = '_';
}
@@ -537,7 +537,7 @@
GdkPixbufLoader * loader;
size_t ts;
unsigned char * thumb;
-
+
thumb = NULL;
ts = ECRS_getThumbnailFromMetaData(meta,
&thumb);
@@ -560,7 +560,7 @@
return pixbuf;
}
-GtkWidget *
+GtkWidget *
extractMainWidgetFromWindow(GladeXML * xml,
const char * windowName) {
GtkContainer * window;
Modified: gnunet-gtk/src/plugins/fs/meta.h
===================================================================
--- gnunet-gtk/src/plugins/fs/meta.h 2006-11-12 08:58:46 UTC (rev 3727)
+++ gnunet-gtk/src/plugins/fs/meta.h 2006-11-12 09:01:00 UTC (rev 3728)
@@ -51,12 +51,12 @@
const char * valueInputLineName,
const char * metaDataListName);
-struct ECRS_MetaData *
+struct ECRS_MetaData *
getMetaDataFromList(GladeXML * xml,
const char * name,
const char * preview);
-struct ECRS_URI *
+struct ECRS_URI *
getKeywordURIFromList(GladeXML * xml,
const char * name);
Modified: gnunet-gtk/src/plugins/fs/namespace.c
===================================================================
--- gnunet-gtk/src/plugins/fs/namespace.c 2006-11-12 08:58:46 UTC (rev
3727)
+++ gnunet-gtk/src/plugins/fs/namespace.c 2006-11-12 09:01:00 UTC (rev
3728)
@@ -227,7 +227,7 @@
col - 1),
TRUE);
-
+
UNREF(namespaceXML);
DEBUG_END();
@@ -270,12 +270,12 @@
filename = STRDUP(_("no name given"));
} else {
char * dotdot;
-
+
while (NULL != (dotdot = strstr(filename, "..")))
dotdot[0] = dotdot[1] = '_';
filename = validate_utf8(filename);
}
-
+
if (ECRS_isFileUri(fi->uri))
size = ECRS_fileSize(fi->uri);
else
@@ -308,7 +308,7 @@
const HashCode512 * key,
int isRoot,
void * closure) {
- gtkSaveCall(&updateView, (void*) fi);
+ gtkSaveCall(&updateView, (void*) fi);
return OK;
}
@@ -388,7 +388,7 @@
filename = STRDUP(_("no name given"));
else {
char *dotdot;
-
+
while (NULL != (dotdot = strstr(filename, "..")))
dotdot[0] = dotdot[1] = '_';
}
Modified: gnunet-gtk/src/plugins/fs/search.c
===================================================================
--- gnunet-gtk/src/plugins/fs/search.c 2006-11-12 08:58:46 UTC (rev 3727)
+++ gnunet-gtk/src/plugins/fs/search.c 2006-11-12 09:01:00 UTC (rev 3728)
@@ -58,12 +58,12 @@
&iter,
SEARCH_SUMMARY_RESULT_COUNT,
searchContext->resultsReceived,
-1);
-
-
+
+
/* update tab title with the number of results */
new_title =
- g_strdup_printf("%s (%u)",
+ g_strdup_printf("%s (%u)",
searchContext->searchString,
searchContext->resultsReceived);
label = GTK_LABEL(glade_xml_get_widget(searchContext->labelXML,
@@ -89,7 +89,7 @@
mime = getMimeTypeFromMetaData(info->meta);
desc = getDescriptionFromMetaData(info->meta);
- name = getFileNameFromMetaData(info->meta);
+ name = getFileNameFromMetaData(info->meta);
size = ECRS_isFileUri(info->uri) ? ECRS_fileSize(info->uri) : 0;
pixbuf = getThumbnailFromMetaData(info->meta);
size_h = string_get_fancy_byte_size(size);
@@ -115,7 +115,7 @@
/**
* Add the given result to the model (search result
* list).
- *
+ *
* @param info the information to add to the model
* @param uri the search URI
* @param searchContext identifies the search page
@@ -129,7 +129,7 @@
model = GTK_TREE_STORE(gtk_tree_view_get_model(searchContext->treeview));
gtk_tree_store_append(model,
&iter,
- NULL);
+ NULL);
addEntryToSearchTree(searchContext,
NULL,
info,
@@ -142,7 +142,7 @@
* FSUI event: a search was started; create the
* tab and add an entry to the summary.
*/
-SearchList *
+SearchList *
fs_search_started(struct FSUI_SearchList * fsui_list,
const struct ECRS_URI * uri,
unsigned int anonymityLevel,
@@ -186,7 +186,7 @@
= STRDUP(dhead);
list->uri
= ECRS_dupUri(uri);
- list->fsui_list
+ list->fsui_list
= fsui_list;
list->next
= search_head;
@@ -196,7 +196,7 @@
"searchResultsFrame",
PACKAGE_NAME);
connectGladeWithPlugins(list->searchXML);
- list->searchpage
+ list->searchpage
= extractMainWidgetFromWindow(list->searchXML,
"searchResultsFrame");
/* setup tree view and renderers */
@@ -263,7 +263,7 @@
gtk_tree_view_column_set_clickable(column, TRUE);
gtk_tree_view_column_set_reorderable(column, TRUE);
gtk_tree_view_column_set_sort_column_id(column, SEARCH_MIME);
-
+
renderer = gtk_cell_renderer_text_new();
col = gtk_tree_view_insert_column_with_attributes(list->treeview,
-1,
@@ -313,14 +313,14 @@
= gtk_tree_row_reference_new(GTK_TREE_MODEL(search_summary),
path);
gtk_tree_path_free(path);
-
+
/* load label */
list->labelXML
= glade_xml_new(getGladeFileName(),
"searchTabLabelWindow",
PACKAGE_NAME);
connectGladeWithPlugins(list->labelXML);
- list->tab_label
+ list->tab_label
= extractMainWidgetFromWindow(list->labelXML,
"searchTabLabelWindow");
/* process existing results */
@@ -330,11 +330,11 @@
uri);
if (resultCount == 0) /* otherwise already done! */
updateSearchSummary(list);
-
+
/* insert new page into search notebook */
notebook
= GTK_NOTEBOOK(glade_xml_get_widget(getMainXML(),
- "downloadNotebook"));
+ "downloadNotebook"));
pages = gtk_notebook_get_n_pages(GTK_NOTEBOOK(notebook));
gtk_notebook_append_page(notebook,
list->searchpage,
@@ -342,7 +342,7 @@
gtk_notebook_set_current_page(notebook,
pages);
gtk_widget_show(GTK_WIDGET(notebook)); /* may have been hidden! */
-
+
return list;
}
@@ -407,7 +407,7 @@
search_head = search_head->next;
} else {
prev = search_head;
- while (prev->next != list)
+ while (prev->next != list)
prev = prev->next;
prev->next = list->next;
}
@@ -435,13 +435,13 @@
GE_BREAK(ectx, index != -1);
gtk_notebook_remove_page(notebook,
index);
-
+
/* recursively free search model */
if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(list->tree),
&iter))
freeIterSubtree(GTK_TREE_MODEL(list->tree),
&iter);
-
+
/* destroy entry in summary */
path = gtk_tree_row_reference_get_path(list->summaryViewRowReference);
gtk_tree_model_get_iter(GTK_TREE_MODEL(search_summary),
@@ -611,7 +611,7 @@
* search notebook. Note that "searchPage" can thus
* either refer to the main page in the tab or to the
* main entry of the tab label.
- */
+ */
void on_closeSearchButton_clicked_fs(GtkWidget * searchPage,
GtkWidget * closeButton) {
SearchList * list;
Modified: gnunet-gtk/src/plugins/fs/search.h
===================================================================
--- gnunet-gtk/src/plugins/fs/search.h 2006-11-12 08:58:46 UTC (rev 3727)
+++ gnunet-gtk/src/plugins/fs/search.h 2006-11-12 09:01:00 UTC (rev 3728)
@@ -58,7 +58,7 @@
*
* @return internal search context
*/
-SearchList *
+SearchList *
fs_search_started(struct FSUI_SearchList * list,
const struct ECRS_URI * uri,
unsigned int anonymityLevel,
Modified: gnunet-gtk/src/plugins/fs/upload.c
===================================================================
--- gnunet-gtk/src/plugins/fs/upload.c 2006-11-12 08:58:46 UTC (rev 3727)
+++ gnunet-gtk/src/plugins/fs/upload.c 2006-11-12 09:01:00 UTC (rev 3728)
@@ -105,7 +105,7 @@
&iter,
path);
gtk_tree_path_free(path);
- gtk_tree_row_reference_free(list->summaryViewRowReference);
+ gtk_tree_row_reference_free(list->summaryViewRowReference);
list->summaryViewRowReference = NULL;
gtk_tree_store_remove(upload_summary,
&iter);
@@ -113,7 +113,7 @@
if (list->uri != NULL) {
ECRS_freeUri(list->uri);
list->uri = NULL;
- }
+ }
if (upload_head == list)
upload_head = list->next;
else {
@@ -129,7 +129,7 @@
FREE(list);
}
-UploadList *
+UploadList *
fs_upload_started(struct FSUI_UploadList * fsui,
UploadList * parent,
const char * filename,
@@ -175,7 +175,7 @@
UPLOAD_FILENAME, filename,
UPLOAD_PROGRESS, progress,
UPLOAD_URISTRING, "", /* FIXME: set if URI != NULL! */
- UPLOAD_INTERNAL, ret,
+ UPLOAD_INTERNAL, ret,
-1);
path = gtk_tree_model_get_path(GTK_TREE_MODEL(upload_summary),
&iter);
@@ -325,7 +325,7 @@
#ifndef MINGW
-static char *
+static char *
selectFile(const char * oldfilename) {
GladeXML * uploadXML;
GtkFileChooser * dialog;
@@ -341,10 +341,10 @@
gtk_file_chooser_set_filename(dialog,
oldfilename);
if (getToggleButtonValue(getMainXML(),
- "scopeRecursiveButton"))
+ "scopeRecursiveButton"))
gtk_file_chooser_set_action(dialog,
GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
- if (gtk_dialog_run(GTK_DIALOG(dialog)) != GTK_RESPONSE_CANCEL)
+ if (gtk_dialog_run(GTK_DIALOG(dialog)) != GTK_RESPONSE_CANCEL)
ret = gtk_file_chooser_get_filename(dialog);
else
ret = NULL;
@@ -355,7 +355,7 @@
#else /* MINGW */
-static char *
+static char *
selectFile(const char * oldfilename) {
if (getToggleButtonValue(getMainXML(),
"scopeFileOnlyButton"))
@@ -380,7 +380,7 @@
"uploadFilenameComboBoxEntry");
entry = GTK_ENTRY(gtk_bin_get_child(GTK_BIN(uploadLine)));
oldfilename = gtk_entry_get_text(entry);
- if (oldfilename == NULL)
+ if (oldfilename == NULL)
oldfilename = getenv("PWD");
if (oldfilename == NULL)
oldfilename = getenv("HOME");
@@ -390,7 +390,7 @@
filename = selectFile(ofn);
FREE(ofn);
if (NULL == filename)
- return;
+ return;
gtk_entry_set_text(entry,
filename);
model = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(uploadLine)));
@@ -401,7 +401,7 @@
0,
filename,
-1);
- free(filename);
+ free(filename);
}
/* FIXME: handlers for clear and stop! */
@@ -443,13 +443,13 @@
}
void on_clearCompletedUploadsButton_clicked_fs(void * unused,
- GtkWidget * clearButton) {
+ GtkWidget * clearButton) {
gtk_tree_model_foreach(GTK_TREE_MODEL(upload_summary),
&clearCompletedUploadCallback,
NULL);
}
-static void
+static void
fsuiCallUploadCallback(GtkTreeModel * model,
GtkTreePath * path,
GtkTreeIter * iter,
Modified: gnunet-gtk/src/plugins/fs/upload.h
===================================================================
--- gnunet-gtk/src/plugins/fs/upload.h 2006-11-12 08:58:46 UTC (rev 3727)
+++ gnunet-gtk/src/plugins/fs/upload.h 2006-11-12 09:01:00 UTC (rev 3728)
@@ -42,7 +42,7 @@
/**
* @param uri NULL if upload is not yet finished
*/
-UploadList *
+UploadList *
fs_upload_started(struct FSUI_UploadList * fsui,
UploadList * parent,
const char * filename,
Modified: gnunet-gtk/src/plugins/stats/functions.c
===================================================================
--- gnunet-gtk/src/plugins/stats/functions.c 2006-11-12 08:58:46 UTC (rev
3727)
+++ gnunet-gtk/src/plugins/stats/functions.c 2006-11-12 09:01:00 UTC (rev
3728)
@@ -333,7 +333,7 @@
long long lsuccess;
long long llocal;
cron_t now;
-
+
now = get_time();
if (now < last + 2 * cronMINUTES) {
data[0][0] = lastdata;
@@ -364,8 +364,8 @@
data[0][1] = 0.0;
return OK;
}
- if (total == 0)
- return OK;
+ if (total == 0)
+ return OK;
success -= lsuccess;
local -= llocal;
if (success <= local)
Modified: gnunet-gtk/src/plugins/stats/statistics.c
===================================================================
--- gnunet-gtk/src/plugins/stats/statistics.c 2006-11-12 08:58:46 UTC (rev
3727)
+++ gnunet-gtk/src/plugins/stats/statistics.c 2006-11-12 09:01:00 UTC (rev
3728)
@@ -117,8 +117,8 @@
g->disp->allocation.height);
max = 0.26; /* force showing at least the 25% line */
- for (i = 0; i < g->num_points - 1; i++)
- for (j=0;j<g->count;j++)
+ for (i = 0; i < g->num_points - 1; i++)
+ for (j=0;j<g->count;j++)
if (g->data[i][j] > max)
max = g->data[i][j];
max = max * 1.01; /* leave top 1% free */
@@ -130,7 +130,7 @@
for (i = 1; i < 5; i++) {
gint y1 = g->draw_height + 1 - i * dely;
if ( (dely < 30) && (i != 4) )
- continue; /* only print additional
+ continue; /* only print additional
lines if there is enough space! */
if (y1 > 0) {
const gchar * label[] = {
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r3728 - in gnunet-gtk/src: common core include plugins/daemon plugins/fs plugins/stats,
grothoff <=