[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r13599 - gnunet-gtk/src
From: |
gnunet |
Subject: |
[GNUnet-SVN] r13599 - gnunet-gtk/src |
Date: |
Sun, 7 Nov 2010 01:02:26 +0100 |
Author: grothoff
Date: 2010-11-07 01:02:26 +0100 (Sun, 07 Nov 2010)
New Revision: 13599
Modified:
gnunet-gtk/src/edit_publish_dialog.c
gnunet-gtk/src/fs_event_handler.c
gnunet-gtk/src/gnunet-gtk.c
gnunet-gtk/src/main_window_adv_pseudonym.c
gnunet-gtk/src/main_window_file_publish.c
gnunet-gtk/src/peerinfo.c
Log:
misc fixes
Modified: gnunet-gtk/src/edit_publish_dialog.c
===================================================================
--- gnunet-gtk/src/edit_publish_dialog.c 2010-11-06 23:14:16 UTC (rev
13598)
+++ gnunet-gtk/src/edit_publish_dialog.c 2010-11-07 00:02:26 UTC (rev
13599)
@@ -475,7 +475,7 @@
struct GNUNET_CONTAINER_MetaData *md = cls;
GtkTreeModel *tm;
GtkTreeIter iter;
- char *value;
+ gchar *value;
guint ntype;
guint nformat;
int keep;
@@ -563,7 +563,7 @@
GtkTreeIter iter;
struct GNUNET_FS_Uri *nxt;
struct GNUNET_FS_Uri *mrg;
- char *value;
+ gchar *value;
guint ntype;
guint nformat;
GtkSpinButton *sb;
Modified: gnunet-gtk/src/fs_event_handler.c
===================================================================
--- gnunet-gtk/src/fs_event_handler.c 2010-11-06 23:14:16 UTC (rev 13598)
+++ gnunet-gtk/src/fs_event_handler.c 2010-11-07 00:02:26 UTC (rev 13599)
@@ -255,7 +255,7 @@
-1);
if (GNUNET_YES ==
GNUNET_FS_uri_test_equal (xuri, uri))
- return; /* already present */
+ return; /* already present */
}
while (TRUE == gtk_tree_model_iter_next (tm, &iter));
}
@@ -417,11 +417,11 @@
GdkPixbuf *preview;
guint percent_progress;
guint percent_availability;
- char *filename;
- char *uri_as_string;
- char *status_colour;
+ gchar *filename;
+ gchar *uri_as_string;
+ gchar *status_colour;
struct SearchResult *search_result;
- char *mimetype;
+ gchar *mimetype;
guint applicability_rank;
guint availability_certainty;
gint availability_rank;
@@ -666,7 +666,7 @@
struct GNUNET_FS_Uri *uri;
struct GNUNET_CONTAINER_MetaData *meta;
struct SearchResult *sr;
- char *mime;
+ gchar *mime;
struct DownloadContext *dlc;
GNUNET_assert (tab != NULL);
@@ -684,13 +684,14 @@
-1);
dlc = GNUNET_malloc (sizeof (struct DownloadContext));
dlc->uri = GNUNET_FS_uri_dup (uri);
- dlc->mime = mime;
+ dlc->mime = GNUNET_strdup (mime);
dlc->filename = GNUNET_FS_meta_data_suggest_filename (meta);
dlc->meta = GNUNET_CONTAINER_meta_data_duplicate (meta);
dlc->rr = gtk_tree_row_reference_new (tm, path);
dlc->sr = sr->result;
dlc->anonymity = -1;
GNUNET_GTK_open_download_as_dialog (dlc);
+ g_free (mime);
}
@@ -948,7 +949,7 @@
if (pixbuf != NULL)
{
gtk_image_set_from_pixbuf (image, pixbuf);
- /* FIXME: unref pixbuf? */
+ g_object_unref (G_OBJECT (pixbuf));
}
if (meta != NULL)
{
Modified: gnunet-gtk/src/gnunet-gtk.c
===================================================================
--- gnunet-gtk/src/gnunet-gtk.c 2010-11-06 23:14:16 UTC (rev 13598)
+++ gnunet-gtk/src/gnunet-gtk.c 2010-11-07 00:02:26 UTC (rev 13599)
@@ -87,10 +87,6 @@
*/
GPollFD *cached_poll_array;
- /**
- * The main window.
- */
- GtkWidget *main_window;
/**
* Read set.
@@ -175,6 +171,8 @@
g_free (context->cached_poll_array);
GNUNET_NETWORK_fdset_destroy (context->rs);
GNUNET_NETWORK_fdset_destroy (context->ws);
+ gtk_widget_destroy (GTK_WIDGET (gtk_builder_get_object (context->builder,
+
"GNUNET_GTK_main_window")));
g_object_unref (G_OBJECT (context->builder));
g_main_loop_unref (context->gml);
GNUNET_free (context);
@@ -408,10 +406,14 @@
tray_icon_on_click(GtkStatusIcon *status_icon,
gpointer user_data)
{
- if (gtk_window_is_active (GTK_WINDOW (mc->main_window)))
- gtk_widget_hide (mc->main_window);
+ GtkWindow *main_window;
+
+ main_window = GTK_WINDOW (gtk_builder_get_object (mc->builder,
+ "GNUNET_GTK_main_window"));
+ if (gtk_window_is_active (main_window))
+ gtk_widget_hide (GTK_WIDGET (main_window));
else
- gtk_window_present (GTK_WINDOW (mc->main_window));
+ gtk_window_present (main_window);
}
@@ -540,6 +542,7 @@
const struct GNUNET_CONFIGURATION_Handle *cfg)
{
int argc;
+ GtkWidget *main_window;
/* command-line processing */
argc = 0;
@@ -563,9 +566,9 @@
tray_icon = create_tray_icon();
/* setup main window */
- mc->main_window = GTK_WIDGET (gtk_builder_get_object (mc->builder,
-
"GNUNET_GTK_main_window"));
- gtk_window_maximize (GTK_WINDOW (mc->main_window));
+ main_window = GTK_WIDGET (gtk_builder_get_object (mc->builder,
+ "GNUNET_GTK_main_window"));
+ gtk_window_maximize (GTK_WINDOW (main_window));
/* initialize file-sharing */
mc->plugins = EXTRACTOR_plugin_add_defaults
(EXTRACTOR_OPTION_DEFAULT_POLICY);
@@ -610,8 +613,8 @@
/* make GUI visible */
if (!tray_only)
{
- gtk_widget_show (mc->main_window);
- gtk_window_present (GTK_WINDOW (mc->main_window));
+ gtk_widget_show (main_window);
+ gtk_window_present (GTK_WINDOW (main_window));
}
/* start the event loop */
GNUNET_assert (TRUE == g_main_context_acquire (mc->gmc));
Modified: gnunet-gtk/src/main_window_adv_pseudonym.c
===================================================================
--- gnunet-gtk/src/main_window_adv_pseudonym.c 2010-11-06 23:14:16 UTC (rev
13598)
+++ gnunet-gtk/src/main_window_adv_pseudonym.c 2010-11-07 00:02:26 UTC (rev
13599)
@@ -37,7 +37,7 @@
GtkTreeSelection *sel;
GtkTreeModel *tm;
GtkTreeIter iter;
- char *value;
+ gchar *value;
struct GNUNET_FS_Uri *uri;
struct GNUNET_FS_Uri *nuri;
char *nvalue;
@@ -60,6 +60,7 @@
{
GNUNET_break (0);
GNUNET_free (emsg);
+ g_free (value);
return;
}
nuri = GNUNET_FS_uri_ksk_canonicalize (uri);
@@ -70,7 +71,7 @@
GNUNET_FS_uri_destroy (nuri);
GNUNET_FS_uri_destroy (uri);
GNUNET_free (nvalue);
- GNUNET_free (value);
+ g_free (value);
}
Modified: gnunet-gtk/src/main_window_file_publish.c
===================================================================
--- gnunet-gtk/src/main_window_file_publish.c 2010-11-06 23:14:16 UTC (rev
13598)
+++ gnunet-gtk/src/main_window_file_publish.c 2010-11-07 00:02:26 UTC (rev
13599)
@@ -83,7 +83,7 @@
int is_dir;
struct GNUNET_FS_FileInformation *fip;
int ns_ok;
- char *namespace_id;
+ gchar *namespace_id;
tm = GTK_TREE_MODEL (gtk_builder_get_object (master_builder,
"GNUNET_GTK_file_sharing_publishing_tree_store"));
@@ -100,7 +100,7 @@
if (namespace_id == NULL)
ns_ok = GNUNET_NO;
else
- GNUNET_free (namespace_id);
+ g_free (namespace_id);
}
up_button = GTK_WIDGET (gtk_builder_get_object (master_builder,
"GNUNET_GTK_master_publish_dialog_up_button"));
@@ -1008,7 +1008,7 @@
struct GNUNET_FS_FileInformation *fip;
GtkTreeView *tv;
gint do_index;
- char *short_fn;
+ gchar *short_fn;
guint anonymity_level;
guint priority;
char *fsf;
@@ -1432,7 +1432,7 @@
int do_index;
guint anonymity_level;
guint priority;
- char *short_fn;
+ gchar *short_fn;
struct GNUNET_FS_FileInformation *fip;
tv = GTK_TREE_VIEW (gtk_builder_get_object (master_builder,
@@ -1875,8 +1875,8 @@
GtkTreeModel *tm;
GtkTreeModel *ptm;
struct GNUNET_FS_Namespace *namespace;
- char *namespace_id;
- char *namespace_uid;
+ gchar *namespace_id;
+ gchar *namespace_uid;
GNUNET_assert (master_builder == NULL);
master_builder = GNUNET_GTK_get_new_builder ("publish_dialog.glade");
@@ -1931,8 +1931,10 @@
GNUNET_FS_PUBLISH_OPTION_NONE);
}
while (gtk_tree_model_iter_next (tm, &iter));
- GNUNET_free_non_null (namespace_uid);
- GNUNET_free_non_null (namespace_id);
+ if (namespace_id != NULL)
+ g_free (namespace_id);
+ if (namespace_uid != NULL)
+ g_free (namespace_uid);
}
ptm = GTK_TREE_MODEL (gtk_builder_get_object (master_builder,
"GNUNET_GTK_pseudonym_tree_store"));
Modified: gnunet-gtk/src/peerinfo.c
===================================================================
--- gnunet-gtk/src/peerinfo.c 2010-11-06 23:14:16 UTC (rev 13598)
+++ gnunet-gtk/src/peerinfo.c 2010-11-07 00:02:26 UTC (rev 13599)
@@ -42,7 +42,7 @@
GtkTreeModel *tm;
GtkTreeIter iter;
int found;
- char *pid;
+ gchar *pid;
const char *npid;
struct GNUNET_CRYPTO_HashAsciiEncoded enc;
@@ -65,9 +65,11 @@
if (0 == strcmp (pid, npid))
{
found = GNUNET_YES;
+ g_free (pid);
break;
}
}
+ g_free (pid);
}
while ( (found == GNUNET_NO) &&
(TRUE == gtk_tree_model_iter_next (tm,
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r13599 - gnunet-gtk/src,
gnunet <=