[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r37749 - gnunet-gtk/src/lib
From: |
gnunet |
Subject: |
[GNUnet-SVN] r37749 - gnunet-gtk/src/lib |
Date: |
Mon, 22 Aug 2016 15:09:06 +0200 |
Author: grothoff
Date: 2016-08-22 15:09:06 +0200 (Mon, 22 Aug 2016)
New Revision: 37749
Modified:
gnunet-gtk/src/lib/eventloop.c
gnunet-gtk/src/lib/glade.c
Log:
-replace deprecated code
Modified: gnunet-gtk/src/lib/eventloop.c
===================================================================
--- gnunet-gtk/src/lib/eventloop.c 2016-08-22 12:59:15 UTC (rev 37748)
+++ gnunet-gtk/src/lib/eventloop.c 2016-08-22 13:09:06 UTC (rev 37749)
@@ -206,8 +206,12 @@
}
plug = gtk_plug_new ((Window) id);
child = gtk_bin_get_child (GTK_BIN (main_window));
- gtk_widget_reparent (child,
- plug);
+ g_object_ref (child);
+ gtk_container_remove (GTK_CONTAINER (main_window),
+ child);
+ gtk_container_add (GTK_CONTAINER (plug),
+ child);
+ g_object_unref (child);
gtk_widget_destroy (main_window);
return plug;
#else
Modified: gnunet-gtk/src/lib/glade.c
===================================================================
--- gnunet-gtk/src/lib/glade.c 2016-08-22 12:59:15 UTC (rev 37748)
+++ gnunet-gtk/src/lib/glade.c 2016-08-22 13:09:06 UTC (rev 37749)
@@ -36,7 +36,8 @@
char *buf;
buf = GNUNET_OS_installation_get_path (GNUNET_OS_IPK_ICONDIR);
- gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (), buf);
+ gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
+ buf);
GNUNET_free (buf);
}
@@ -52,7 +53,7 @@
{
static char *dd;
- if (dd == NULL)
+ if (NULL == dd)
dd = GNUNET_OS_installation_get_path (GNUNET_OS_IPK_DATADIR);
return dd;
}
@@ -68,25 +69,31 @@
* @return TRUE on success, FALSE on errors
*/
gboolean
-GNUNET_GTK_get_tree_string (GtkTreeView * treeview, GtkTreePath * treepath,
- guint column, gchar ** value)
+GNUNET_GTK_get_tree_string (GtkTreeView *treeview,
+ GtkTreePath *treepath,
+ guint column,
+ gchar ** value)
{
gboolean ok;
GtkTreeModel *model;
+ GtkTreeIter iter;
model = gtk_tree_view_get_model (treeview);
- if (!model)
+ if (! model)
return FALSE;
-
- GtkTreeIter iter;
-
- ok = gtk_tree_model_get_iter (model, &iter, treepath);
- if (!ok)
+ ok = gtk_tree_model_get_iter (model,
+ &iter,
+ treepath);
+ if (! ok)
return FALSE;
*value = NULL;
- gtk_tree_model_get (model, &iter, column, value, -1);
- if (*value == NULL)
+ gtk_tree_model_get (model,
+ &iter,
+ column,
+ value,
+ -1);
+ if (NULL == *value)
return FALSE;
return TRUE;
}
@@ -113,15 +120,19 @@
ret = gtk_builder_new ();
gtk_builder_set_translation_domain (ret, "gnunet-gtk");
- GNUNET_asprintf (&glade_path, "%s%s",
+ GNUNET_asprintf (&glade_path,
+ "%s%s",
GNUNET_GTK_get_data_dir (),
filename);
error = NULL;
- if (0 == gtk_builder_add_from_file (ret, glade_path, &error))
+ if (0 == gtk_builder_add_from_file (ret,
+ glade_path,
+ &error))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("Failed to load `%s': %s\n"),
- glade_path, error->message);
+ glade_path,
+ error->message);
g_error_free (error);
GNUNET_free (glade_path);
return NULL;
@@ -129,9 +140,12 @@
if (NULL == user_data)
user_data = ret;
if (NULL != cb)
- gtk_builder_connect_signals_full (ret, cb, user_data);
+ gtk_builder_connect_signals_full (ret,
+ cb,
+ user_data);
else
- gtk_builder_connect_signals (ret, user_data);
+ gtk_builder_connect_signals (ret,
+ user_data);
GNUNET_free (glade_path);
return ret;
}
@@ -144,13 +158,16 @@
* @param root root of the subtree to remove
*/
void
-GNUNET_FS_GTK_remove_treestore_subtree (GtkTreeStore * ts,
- GtkTreeIter * root)
+GNUNET_FS_GTK_remove_treestore_subtree (GtkTreeStore *ts,
+ GtkTreeIter *root)
{
GtkTreeIter child;
- while (gtk_tree_model_iter_children (GTK_TREE_MODEL (ts), &child, root))
- GNUNET_FS_GTK_remove_treestore_subtree (ts, &child);
+ while (gtk_tree_model_iter_children (GTK_TREE_MODEL (ts),
+ &child,
+ root))
+ GNUNET_FS_GTK_remove_treestore_subtree (ts,
+ &child);
gtk_tree_store_remove (ts, root);
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r37749 - gnunet-gtk/src/lib,
gnunet <=