[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r33518 - in gnunet-gtk/src: fs setup
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r33518 - in gnunet-gtk/src: fs setup |
|
Date: |
Wed, 4 Jun 2014 16:17:19 +0200 |
Author: grothoff
Date: 2014-06-04 16:17:19 +0200 (Wed, 04 Jun 2014)
New Revision: 33518
Modified:
gnunet-gtk/src/fs/gnunet-fs-gtk.c
gnunet-gtk/src/fs/gnunet-fs-gtk_main-window-connection.c
gnunet-gtk/src/fs/gnunet-fs-gtk_publish-dialog.c
gnunet-gtk/src/fs/gnunet-fs-gtk_publish-edit-dialog.c
gnunet-gtk/src/fs/gnunet-fs-gtk_unindex.c
gnunet-gtk/src/setup/gnunet-setup-options.c
gnunet-gtk/src/setup/gnunet-setup-transport-test.c
Log:
modernizing use of Gtk3 APIs
Modified: gnunet-gtk/src/fs/gnunet-fs-gtk.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk.c 2014-06-04 13:49:37 UTC (rev 33517)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk.c 2014-06-04 14:17:19 UTC (rev 33518)
@@ -764,7 +764,8 @@
}
/* Allow multiple selection in metadata view; */
- /* FIXME-GTK3: this can be done within (modern versions of) glade */
+ /* FIXME-GTK3: this can be done within (modern versions of) glade
+ (However, this needs GTK >= 3.2, we currently target 3.0) */
gtk_tree_selection_set_mode (gtk_tree_view_get_selection
(main_context.md_treeview),
GTK_SELECTION_MULTIPLE);
if (NULL == getenv ("GNUNET_FS_GTK_PLUG"))
Modified: gnunet-gtk/src/fs/gnunet-fs-gtk_main-window-connection.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk_main-window-connection.c 2014-06-04
13:49:37 UTC (rev 33517)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk_main-window-connection.c 2014-06-04
14:17:19 UTC (rev 33518)
@@ -34,12 +34,13 @@
* @param tooltip new tooltip text
*/
void
-GNUNET_FS_GTK_update_connection_indicator (
- struct GNUNET_GTK_MainWindowContext *main_ctx,
- gboolean connected, const gchar *tooltip)
+GNUNET_FS_GTK_update_connection_indicator (struct GNUNET_GTK_MainWindowContext
*main_ctx,
+ gboolean connected,
+ const gchar *tooltip)
{
- gtk_image_set_from_stock (main_ctx->connection_indicator,
- connected ? "gtk-yes" : "gtk-no", GTK_ICON_SIZE_BUTTON);
+ gtk_image_set_from_icon_name (main_ctx->connection_indicator,
+ connected ? "network-transmit-receive" :
"network-offline",
+ GTK_ICON_SIZE_BUTTON);
gtk_widget_set_tooltip_text (GTK_WIDGET (main_ctx->connection_indicator),
tooltip);
}
Modified: gnunet-gtk/src/fs/gnunet-fs-gtk_publish-dialog.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk_publish-dialog.c 2014-06-04 13:49:37 UTC
(rev 33517)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk_publish-dialog.c 2014-06-04 14:17:19 UTC
(rev 33518)
@@ -557,8 +557,8 @@
* @param ts the changed selection
* @param user_data master publishing dialog context of our window
*/
-static void
-selection_changed_cb (GtkTreeSelection * ts,
+void
+GNUNET_GTK_master_publish_dialog_file_informatino_treeview_selection_changed_cb
(GtkTreeSelection * ts,
gpointer user_data)
{
struct MainPublishingDialogContext *ctx = user_data;
@@ -899,8 +899,9 @@
* @param ts the changed selection
* @param user_data master publishing dialog context of our window
*/
-static void
-identifiers_selection_changed_cb (GtkTreeSelection *ts, gpointer user_data)
+void
+GNUNET_GTK_master_publish_dialog_previous_identifiers_treeview_selection_changed_cb
(GtkTreeSelection *ts,
+
gpointer user_data)
{
struct MainPublishingDialogContext *ctx = user_data;
GtkTreeIter iter;
@@ -2835,12 +2836,6 @@
g_signal_connect (ctx->identifiers_expander, "notify::expanded", G_CALLBACK
(expander_callback), ctx);
- /* connect signals; FIXME-GTK3: these could be connected with (modern) Glade
*/
- g_signal_connect (G_OBJECT (ctx->file_info_selection), "changed",
- G_CALLBACK (selection_changed_cb), ctx);
- g_signal_connect (G_OBJECT (ctx->identifiers_selection), "changed",
- G_CALLBACK (identifiers_selection_changed_cb), ctx);
-
cfg = GNUNET_FS_GTK_get_configuration ();
ctx->identity = GNUNET_IDENTITY_connect (cfg,
&add_namespace_to_ts,
Modified: gnunet-gtk/src/fs/gnunet-fs-gtk_publish-edit-dialog.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk_publish-edit-dialog.c 2014-06-04
13:49:37 UTC (rev 33517)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk_publish-edit-dialog.c 2014-06-04
14:17:19 UTC (rev 33518)
@@ -353,9 +353,8 @@
* @param ts the tree selection object
* @param user_data the 'struct EditPublicationDialogContext'
*/
-/* FIXME-GTK3: connect this signal via glade (modern versions of Glade support
this) */
-static void
-metadata_selection_changed_cb (GtkTreeSelection *ts,
+void
+GNUNET_GTK_edit_publication_metadata_treeview_selection_changed_cb
(GtkTreeSelection *ts,
gpointer user_data)
{
struct EditPublicationDialogContext *ctx = user_data;
@@ -607,9 +606,8 @@
* @param ts the tree selection object
* @param user_data the 'struct EditPublicationDialogContext'
*/
-/* FIXME-GTK3: connect this signal via glade (modern versions of Glade support
this) */
-static void
-keywords_selection_changed_cb (GtkTreeSelection *ts,
+void
+GNUNET_GTK_edit_publication_keyword_list_treeview_selection_changed_cb
(GtkTreeSelection *ts,
gpointer user_data)
{
struct EditPublicationDialogContext *ctx = user_data;
@@ -1057,7 +1055,7 @@
/* fall back to Gtk mime-detection; this only works on GNU */
GFileInfo *finfo;
const char *gmime;
-
+
finfo = g_file_query_info (f, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE,
0, NULL, NULL);
gmime = g_file_info_get_attribute_string (finfo,
@@ -1241,11 +1239,11 @@
*
* @param parent parent window of the dialog
* @param fip information about the file information that is to be edited
- * @param is_namespace_edit GNUNET_YES if we are editing a namespace
advertisement;
+ * @param is_namespace_edit #GNUNET_YES if we are editing a namespace
advertisement;
* this means that keywords are required and that a "root" can be
* entered
* @param cb function to call when the dialog is closed
- * @param cb_cls closure for 'cb'
+ * @param cb_cls closure for @a cb
*/
void
GNUNET_FS_GTK_edit_publish_dialog (GtkWindow * parent,
@@ -1260,10 +1258,8 @@
GtkLabel *index_label;
GtkLabel *root_label;
struct EditPublicationDialogContext *ctx;
- GtkTreeSelection *meta_selection;
- GtkTreeSelection *keywords_selection;
- ctx = GNUNET_malloc (sizeof (struct EditPublicationDialogContext));
+ ctx = GNUNET_new (struct EditPublicationDialogContext);
ctx->fip = fip;
ctx->preview_changed = GNUNET_NO;
ctx->allow_no_keywords = is_namespace_edit ? GNUNET_NO : GNUNET_YES;
@@ -1273,7 +1269,7 @@
ctx->meta_combo_selected_type_id = -1;
ctx->builder = GNUNET_GTK_get_new_builder
("gnunet_fs_gtk_edit_publication.glade", ctx);
- if (ctx->builder == NULL)
+ if (NULL == ctx->builder)
{
GNUNET_free (ctx);
return;
@@ -1365,14 +1361,6 @@
gtk_widget_set_visible (GTK_WIDGET (root_label),
is_namespace_edit ? TRUE : FALSE);
- /* FIXME-GTK3: these signal handlers can be set by (modern) versions of
Glade */
- keywords_selection = gtk_tree_view_get_selection (ctx->keywords_treeview);
- g_signal_connect (G_OBJECT (keywords_selection), "changed",
- G_CALLBACK (keywords_selection_changed_cb), ctx);
- meta_selection = gtk_tree_view_get_selection (ctx->meta_treeview);
- g_signal_connect (G_OBJECT (meta_selection), "changed",
- G_CALLBACK (metadata_selection_changed_cb), ctx);
-
/* import meta data and options */
GNUNET_FS_file_information_inspect (fip, &file_information_import, ctx);
Modified: gnunet-gtk/src/fs/gnunet-fs-gtk_unindex.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk_unindex.c 2014-06-04 13:49:37 UTC (rev
33517)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk_unindex.c 2014-06-04 14:17:19 UTC (rev
33518)
@@ -279,8 +279,8 @@
* @param ts the changed selection
* @param user_data our unindex context
*/
-static void
-selection_changed_cb (GtkTreeSelection * ts,
+void
+GNUNET_FS_GTK_unindex_treeview_selection_changed_cb (GtkTreeSelection *ts,
gpointer user_data)
{
struct UnindexDialogContext *udc = user_data;
@@ -394,7 +394,7 @@
gtk_window_present (GTK_WINDOW (master_udc->dialog));
return;
}
- udc = GNUNET_malloc (sizeof (struct UnindexDialogContext));
+ udc = GNUNET_new (struct UnindexDialogContext);
udc->builder =
GNUNET_GTK_get_new_builder ("gnunet_fs_gtk_unindex.glade", udc);
if (NULL == udc->builder)
@@ -418,9 +418,6 @@
toplevel = gtk_widget_get_toplevel (dummy);
if (GTK_IS_WINDOW (toplevel))
gtk_window_set_transient_for (GTK_WINDOW (udc->dialog), GTK_WINDOW
(toplevel));
- /* connect signals; FIXME-GTK3: these could be connected with (modern) Glade
*/
- g_signal_connect (G_OBJECT (udc->selection), "changed",
- G_CALLBACK (selection_changed_cb), udc);
gtk_window_present (GTK_WINDOW (udc->dialog));
master_udc = udc;
}
Modified: gnunet-gtk/src/setup/gnunet-setup-options.c
===================================================================
--- gnunet-gtk/src/setup/gnunet-setup-options.c 2014-06-04 13:49:37 UTC (rev
33517)
+++ gnunet-gtk/src/setup/gnunet-setup-options.c 2014-06-04 14:17:19 UTC (rev
33518)
@@ -446,12 +446,12 @@
unsigned int port;
GtkSpinButton *spinbt_i;
GtkSpinButton *spinbt_j;
- GdkColor color;
- GdkColor *pcolor;
+ GdkRGBA color;
+ GdkRGBA *pcolor;
int found;
char *tooltip;
- gdk_color_parse (INVALID_INPUT_COLOR, &color);
+ gdk_rgba_parse (&color, INVALID_INPUT_COLOR);
for (i = 0;
port_specifications[i].spinbutton_name != NULL;
i++)
@@ -488,11 +488,11 @@
pcolor = NULL;
tooltip = GNUNET_strdup ("");
}
- gtk_widget_modify_text (GTK_WIDGET (spinbt_i),
- GTK_STATE_NORMAL, pcolor);
- gtk_widget_modify_text (GTK_WIDGET (spinbt_i),
+ gtk_widget_override_color (GTK_WIDGET (spinbt_i),
+ GTK_STATE_NORMAL, pcolor);
+ gtk_widget_override_color (GTK_WIDGET (spinbt_i),
GTK_STATE_ACTIVE, pcolor);
- gtk_widget_modify_text (GTK_WIDGET (spinbt_i),
+ gtk_widget_override_color (GTK_WIDGET (spinbt_i),
GTK_STATE_SELECTED, pcolor);
gtk_widget_set_tooltip_text (GTK_WIDGET (spinbt_i), tooltip);
GNUNET_free (tooltip);
@@ -511,8 +511,8 @@
GObject *widget)
{
GtkEntry *entry;
- GdkColor color;
- GdkColor *pcolor;
+ GdkRGBA color;
+ GdkRGBA *pcolor;
gboolean invalid;
const char *text;
char *r;
@@ -524,7 +524,7 @@
invalid = ( (strlen (text) > 0) &&
( (NULL == r) ||
(text[strlen(text)-1] != ';') ) );
- gdk_color_parse (INVALID_INPUT_COLOR, &color);
+ gdk_rgba_parse (&color, INVALID_INPUT_COLOR);
if (invalid)
{
pcolor = &color;
@@ -536,12 +536,12 @@
pcolor = NULL;
tooltip = GNUNET_strdup ("");
}
- gtk_widget_modify_bg (GTK_WIDGET (widget),
- GTK_STATE_NORMAL, pcolor);
- gtk_widget_modify_bg (GTK_WIDGET (widget),
- GTK_STATE_ACTIVE, pcolor);
- gtk_widget_modify_bg (GTK_WIDGET (widget),
- GTK_STATE_SELECTED, pcolor);
+ gtk_widget_override_background_color (GTK_WIDGET (widget),
+ GTK_STATE_NORMAL, pcolor);
+ gtk_widget_override_background_color (GTK_WIDGET (widget),
+ GTK_STATE_ACTIVE, pcolor);
+ gtk_widget_override_background_color (GTK_WIDGET (widget),
+ GTK_STATE_SELECTED, pcolor);
gtk_widget_set_tooltip_text (GTK_WIDGET (widget),
tooltip);
GNUNET_free (tooltip);
@@ -560,8 +560,8 @@
GObject *widget)
{
GtkEntry *entry;
- GdkColor color;
- GdkColor *pcolor;
+ GdkRGBA color;
+ GdkRGBA *pcolor;
gboolean invalid;
const char *text;
char *r;
@@ -573,7 +573,7 @@
invalid = ( (strlen (text) > 0) &&
( (NULL == r) ||
(text[strlen(text)-1] != ';') ) );
- gdk_color_parse (INVALID_INPUT_COLOR, &color);
+ gdk_rgba_parse (&color, INVALID_INPUT_COLOR);
if (invalid)
{
pcolor = &color;
@@ -585,12 +585,12 @@
pcolor = NULL;
tooltip = GNUNET_strdup ("");
}
- gtk_widget_modify_bg (GTK_WIDGET (widget),
- GTK_STATE_NORMAL, pcolor);
- gtk_widget_modify_bg (GTK_WIDGET (widget),
- GTK_STATE_ACTIVE, pcolor);
- gtk_widget_modify_bg (GTK_WIDGET (widget),
- GTK_STATE_SELECTED, pcolor);
+ gtk_widget_override_background_color (GTK_WIDGET (widget),
+ GTK_STATE_NORMAL, pcolor);
+ gtk_widget_override_background_color (GTK_WIDGET (widget),
+ GTK_STATE_ACTIVE, pcolor);
+ gtk_widget_override_background_color (GTK_WIDGET (widget),
+ GTK_STATE_SELECTED, pcolor);
gtk_widget_set_tooltip_text (GTK_WIDGET (widget),
tooltip);
GNUNET_free (tooltip);
Modified: gnunet-gtk/src/setup/gnunet-setup-transport-test.c
===================================================================
--- gnunet-gtk/src/setup/gnunet-setup-transport-test.c 2014-06-04 13:49:37 UTC
(rev 33517)
+++ gnunet-gtk/src/setup/gnunet-setup-transport-test.c 2014-06-04 14:17:19 UTC
(rev 33518)
@@ -107,16 +107,18 @@
* Clean up and update GUI (with success).
*
* @param cls test context
- * @param success currently always #GNUNET_OK
- * @param emsg error message, NULL on success
+ * @param result status code for the NAT test
*/
static void
-result_callback (void *cls, int success,
- const char *emsg)
+result_callback (void *cls,
+ enum GNUNET_NAT_FailureCode result)
{
struct TestContext *tc = cls;
- display_test_result (tc, success);
+ display_test_result (tc,
+ (GNUNET_NAT_ERROR_SUCCESS == result)
+ ? GNUNET_OK
+ : GNUNET_SYSERR);
}
@@ -128,7 +130,8 @@
* @param tc scheduler callback
*/
static void
-fail_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+fail_timeout (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct TestContext *tstc = cls;
@@ -176,7 +179,8 @@
GNUNET_RESOLVER_connect (cfg);
tc->tst =
GNUNET_NAT_test_start (cfg, is_tcp, (uint16_t) bnd_port,
- (uint16_t) adv_port, &result_callback, tc);
+ (uint16_t) adv_port,
+ &result_callback, tc);
if (NULL == tc->tst)
{
display_test_result (tc, GNUNET_SYSERR);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r33518 - in gnunet-gtk/src: fs setup,
gnunet <=