[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r7149 - in gnunet-gtk: po src/core src/plugins/fs
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r7149 - in gnunet-gtk: po src/core src/plugins/fs |
|
Date: |
Thu, 12 Jun 2008 00:02:06 -0600 (MDT) |
Author: grothoff
Date: 2008-06-12 00:02:06 -0600 (Thu, 12 Jun 2008)
New Revision: 7149
Modified:
gnunet-gtk/po/Makefile.in
gnunet-gtk/src/core/main.c
gnunet-gtk/src/plugins/fs/download.c
gnunet-gtk/src/plugins/fs/fs.c
gnunet-gtk/src/plugins/fs/search.c
gnunet-gtk/src/plugins/fs/status.c
gnunet-gtk/src/plugins/fs/upload.c
Log:
indent
Modified: gnunet-gtk/po/Makefile.in
===================================================================
--- gnunet-gtk/po/Makefile.in 2008-06-12 06:01:44 UTC (rev 7148)
+++ gnunet-gtk/po/Makefile.in 2008-06-12 06:02:06 UTC (rev 7149)
@@ -11,7 +11,7 @@
# Origin: gettext-0.13
PACKAGE = gnunet-gtk
-VERSION = 0.8.0pre1
+VERSION = 0.8.0
SHELL = /bin/sh
Modified: gnunet-gtk/src/core/main.c
===================================================================
--- gnunet-gtk/src/core/main.c 2008-06-12 06:01:44 UTC (rev 7148)
+++ gnunet-gtk/src/core/main.c 2008-06-12 06:02:06 UTC (rev 7149)
@@ -77,19 +77,19 @@
#endif
static void
-setIconSearchPath()
+setIconSearchPath ()
{
char *dataDir;
char *buf;
-
+
dataDir = GNUNET_get_installation_path (GNUNET_IPK_DATADIR);
- buf = GNUNET_malloc(strlen(dataDir) + strlen("../gnunet-gtk/icons/") + 2);
- strcpy(buf, dataDir);
- strcat(buf, "../gnunet-gtk/icons/");
- gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
- buf);
- GNUNET_free(buf);
- GNUNET_free(dataDir);
+ buf =
+ GNUNET_malloc (strlen (dataDir) + strlen ("../gnunet-gtk/icons/") + 2);
+ strcpy (buf, dataDir);
+ strcat (buf, "../gnunet-gtk/icons/");
+ gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (), buf);
+ GNUNET_free (buf);
+ GNUNET_free (dataDir);
}
int
@@ -134,7 +134,7 @@
bind_textdomain_codeset ("GNUnet", "UTF-8");
bind_textdomain_codeset ("gnunet-gtk", "UTF-8");
#endif
- setIconSearchPath();
+ setIconSearchPath ();
GNUNET_GTK_initialize_common_library (cfg, &GNUNET_GTK_main_quit);
/* configure GTK logging */
GNUNET_GC_get_configuration_value_string (cfg,
@@ -152,7 +152,7 @@
my_ctx = GNUNET_GTK_create_gtk_logger (mask);
GNUNET_GE_setDefaultContext (my_ctx);
root =
- glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "mainWindow");
+ glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "mainWindow");
gtk_window_maximize (GTK_WINDOW (root));
gtk_widget_show (root);
gtk_window_present (GTK_WINDOW (root));
Modified: gnunet-gtk/src/plugins/fs/download.c
===================================================================
--- gnunet-gtk/src/plugins/fs/download.c 2008-06-12 06:01:44 UTC (rev
7148)
+++ gnunet-gtk/src/plugins/fs/download.c 2008-06-12 06:02:06 UTC (rev
7149)
@@ -288,11 +288,10 @@
gtk_tree_store_set (sl_parent->tree,
&iter, SEARCH_STATUS,
getStatusName
- (GNUNET_URITRACK_DOWNLOAD_STARTED),
- SEARCH_STATUS_LOGO,
+ (GNUNET_URITRACK_DOWNLOAD_STARTED),
+ SEARCH_STATUS_LOGO,
getStatusLogo
- (GNUNET_URITRACK_DOWNLOAD_STARTED),
- -1);
+ (GNUNET_URITRACK_DOWNLOAD_STARTED), -1);
break;
}
valid = gtk_tree_model_iter_next (model, &iter);
@@ -448,8 +447,7 @@
GNUNET_free (list->filename);
GNUNET_ECRS_uri_destroy (list->uri);
- if ( (list->searchList != NULL) &&
- (list->searchViewRowReference != NULL) )
+ if ((list->searchList != NULL) && (list->searchViewRowReference != NULL))
{
path = gtk_tree_row_reference_get_path (list->searchViewRowReference);
if (path == NULL)
@@ -461,13 +459,14 @@
model = GTK_TREE_MODEL (list->searchList->tree);
gtk_tree_model_get_iter (model, &iter, path);
gtk_tree_path_free (path);
- gtk_tree_store_set (list->searchList->tree,
- &iter,
- SEARCH_STATUS,
- getStatusName (GNUNET_URITRACK_DOWNLOAD_ABORTED),
- SEARCH_STATUS_LOGO,
- getStatusLogo (GNUNET_URITRACK_DOWNLOAD_ABORTED),
- -1);
+ gtk_tree_store_set (list->searchList->tree,
+ &iter,
+ SEARCH_STATUS,
+ getStatusName
+ (GNUNET_URITRACK_DOWNLOAD_ABORTED),
+ SEARCH_STATUS_LOGO,
+ getStatusLogo
+ (GNUNET_URITRACK_DOWNLOAD_ABORTED), -1);
}
}
if (list->searchViewRowReference != NULL)
@@ -767,8 +766,7 @@
*/
gboolean
on_searchResults_button_press_fs (GtkWidget * treeview,
- GdkEventButton * event,
- gpointer data)
+ GdkEventButton * event, gpointer data)
{
if (event->type == GDK_2BUTTON_PRESS)
on_downloadButton_clicked_fs (treeview, NULL);
@@ -886,8 +884,7 @@
}
void
-on_clearCompletedDownloads_clicked_fs (void *unused,
- GtkWidget * clearButton)
+on_clearCompletedDownloads_clicked_fs (void *unused, GtkWidget * clearButton)
{
GNUNET_GTK_tree_model_foreach (GTK_TREE_MODEL (download_summary),
&clearCompletedDownloadCallback, NULL);
@@ -956,9 +953,10 @@
GNUNET_GTK_connect_glade_with_plugins (contextMenuXML);
menu = glade_xml_get_widget (contextMenuXML, "downloadsContextMenu");
if (event_button->button == 3)
- gtk_menu_popup (GTK_MENU(menu),
+ gtk_menu_popup (GTK_MENU (menu),
NULL, NULL, NULL, NULL,
event_button->button, event_button->time);
return FALSE;
}
+
/* end of download.c */
Modified: gnunet-gtk/src/plugins/fs/fs.c
===================================================================
--- gnunet-gtk/src/plugins/fs/fs.c 2008-06-12 06:01:44 UTC (rev 7148)
+++ gnunet-gtk/src/plugins/fs/fs.c 2008-06-12 06:02:06 UTC (rev 7149)
@@ -330,7 +330,7 @@
}
int
-on_upload_copy_uri_activate_fs (void *dummy1, GtkWidget *dummy2)
+on_upload_copy_uri_activate_fs (void *dummy1, GtkWidget * dummy2)
{
GtkWidget *uploadsList =
glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
@@ -342,7 +342,7 @@
GtkClipboard *clip;
path = NULL;
- if (FALSE == gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW(uploadsList),
+ if (FALSE == gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (uploadsList),
last_x,
last_y,
&path, NULL, NULL, NULL))
Modified: gnunet-gtk/src/plugins/fs/search.c
===================================================================
--- gnunet-gtk/src/plugins/fs/search.c 2008-06-12 06:01:44 UTC (rev 7148)
+++ gnunet-gtk/src/plugins/fs/search.c 2008-06-12 06:02:06 UTC (rev 7149)
@@ -250,7 +250,7 @@
SEARCH_PIXBUF, pixbuf, SEARCH_URI,
GNUNET_ECRS_uri_duplicate (info->uri), SEARCH_META,
GNUNET_meta_data_duplicate (info->meta),
- SEARCH_INTERNAL,searchContext,
+ SEARCH_INTERNAL, searchContext,
SEARCH_INTERNAL_PARENT, downloadParent,
SEARCH_STATUS, getStatusName (state),
SEARCH_STATUS_LOGO, statusLogo,
@@ -760,7 +760,8 @@
-1,
_("Status"),
renderer,
- "pixbuf",
SEARCH_STATUS_LOGO,
+ "pixbuf",
+ SEARCH_STATUS_LOGO,
NULL);
column = gtk_tree_view_get_column (list->treeview, col - 1);
gtk_tree_view_column_set_resizable (column, TRUE);
@@ -1004,7 +1005,7 @@
GNUNET_GE_BREAK (ectx, index != -1);
gtk_notebook_remove_page (notebook, index);
if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list->tree), &iter))
- freeIterSubtree (GTK_TREE_MODEL (list->tree), &iter);
+ freeIterSubtree (GTK_TREE_MODEL (list->tree), &iter);
/* free list state itself */
UNREF (list->searchXML);
UNREF (list->labelXML);
Modified: gnunet-gtk/src/plugins/fs/status.c
===================================================================
--- gnunet-gtk/src/plugins/fs/status.c 2008-06-12 06:01:44 UTC (rev 7148)
+++ gnunet-gtk/src/plugins/fs/status.c 2008-06-12 06:02:06 UTC (rev 7149)
@@ -80,22 +80,25 @@
{
if (state & (GNUNET_URITRACK_DIRECTORY_ADDED))
return gtk_icon_theme_load_icon (gtk_icon_theme_get_default (),
- GTK_STOCK_ADD, 16, 0, (GError **)NULL);
+ GTK_STOCK_ADD, 16, 0, (GError **) NULL);
if (state & (GNUNET_URITRACK_INSERTED || GNUNET_URITRACK_INDEXED))
return gtk_icon_theme_load_icon (gtk_icon_theme_get_default (),
- GTK_STOCK_ADD, 16, 0, (GError **)NULL);
+ GTK_STOCK_ADD, 16, 0, (GError **) NULL);
if ((state & GNUNET_URITRACK_DOWNLOAD_STARTED) &&
(0 == (state &
(GNUNET_URITRACK_DOWNLOAD_COMPLETED |
GNUNET_URITRACK_DOWNLOAD_ABORTED))))
return gtk_icon_theme_load_icon (gtk_icon_theme_get_default (),
- GTK_STOCK_GO_DOWN, 16, 0, (GError
**)NULL);
+ GTK_STOCK_GO_DOWN, 16, 0,
+ (GError **) NULL);
if (state & GNUNET_URITRACK_DOWNLOAD_COMPLETED)
return gtk_icon_theme_load_icon (gtk_icon_theme_get_default (),
- GTK_STOCK_APPLY, 16, 0, (GError **)NULL);
+ GTK_STOCK_APPLY, 16, 0,
+ (GError **) NULL);
if (state & GNUNET_URITRACK_DOWNLOAD_ABORTED)
return gtk_icon_theme_load_icon (gtk_icon_theme_get_default (),
- GTK_STOCK_CANCEL, 16, 0, (GError **)NULL);
+ GTK_STOCK_CANCEL, 16, 0,
+ (GError **) NULL);
return NULL;
}
Modified: gnunet-gtk/src/plugins/fs/upload.c
===================================================================
--- gnunet-gtk/src/plugins/fs/upload.c 2008-06-12 06:01:44 UTC (rev 7148)
+++ gnunet-gtk/src/plugins/fs/upload.c 2008-06-12 06:02:06 UTC (rev 7149)
@@ -659,8 +659,7 @@
}
void
-on_clearCompletedUploads_clicked_fs (void *unused,
- GtkWidget * clearButton)
+on_clearCompletedUploads_clicked_fs (void *unused, GtkWidget * clearButton)
{
GNUNET_GTK_tree_model_foreach (GTK_TREE_MODEL (upload_summary),
&clearCompletedUploadCallback, NULL);
@@ -712,7 +711,7 @@
GNUNET_GTK_connect_glade_with_plugins (contextMenuXML);
menu = glade_xml_get_widget (contextMenuXML, "uploadsContextMenu");
if (event_button->button == 3)
- gtk_menu_popup (GTK_MENU(menu),
+ gtk_menu_popup (GTK_MENU (menu),
NULL, NULL, NULL, NULL,
event_button->button, event_button->time);
return FALSE;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r7149 - in gnunet-gtk: po src/core src/plugins/fs,
gnunet <=