[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r7076 - in gnunet-gtk/src: common include plugins/chat plug
From: |
gnunet |
Subject: |
[GNUnet-SVN] r7076 - in gnunet-gtk/src: common include plugins/chat plugins/fs |
Date: |
Sat, 7 Jun 2008 15:49:34 -0600 (MDT) |
Author: grothoff
Date: 2008-06-07 15:49:33 -0600 (Sat, 07 Jun 2008)
New Revision: 7076
Modified:
gnunet-gtk/src/common/helper.c
gnunet-gtk/src/include/gnunetgtk_common.h
gnunet-gtk/src/plugins/chat/chat.c
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
Log:
cleanup
Modified: gnunet-gtk/src/common/helper.c
===================================================================
--- gnunet-gtk/src/common/helper.c 2008-06-07 21:45:51 UTC (rev 7075)
+++ gnunet-gtk/src/common/helper.c 2008-06-07 21:49:33 UTC (rev 7076)
@@ -698,4 +698,20 @@
return TRUE;
}
+GtkWidget *GNUNET_GTK_extract_main_widget_from_window (GladeXML * xml,
+ const char *windowName)
+{
+ GtkContainer *window;
+ GtkWidget *ret;
+
+ window = GTK_CONTAINER (glade_xml_get_widget (xml, windowName));
+ ret = gtk_bin_get_child (GTK_BIN (window));
+ gtk_widget_ref (ret);
+ gtk_container_remove (window, ret);
+ gtk_widget_destroy (GTK_WIDGET (window));
+ return ret;
+}
+
+
+
/* end of helper.c */
Modified: gnunet-gtk/src/include/gnunetgtk_common.h
===================================================================
--- gnunet-gtk/src/include/gnunetgtk_common.h 2008-06-07 21:45:51 UTC (rev
7075)
+++ gnunet-gtk/src/include/gnunetgtk_common.h 2008-06-07 21:49:33 UTC (rev
7076)
@@ -173,4 +173,11 @@
struct GNUNET_CronManager *GNUNET_GTK_get_cron_manager (void);
+
+GtkWidget *GNUNET_GTK_extract_main_widget_from_window (GladeXML * xml,
+ const char *windowName);
+
+
+
+
#endif
Modified: gnunet-gtk/src/plugins/chat/chat.c
===================================================================
--- gnunet-gtk/src/plugins/chat/chat.c 2008-06-07 21:45:51 UTC (rev 7075)
+++ gnunet-gtk/src/plugins/chat/chat.c 2008-06-07 21:49:33 UTC (rev 7076)
@@ -242,21 +242,6 @@
GNUNET_mutex_unlock (lock);
}
-/** FIXME: move to gtkcommon! */
-static GtkWidget *
-extractMainWidgetFromWindow (GladeXML * xml, const char *windowName)
-{
- GtkContainer *window;
- GtkWidget *ret;
-
- window = GTK_CONTAINER (glade_xml_get_widget (xml, windowName));
- ret = gtk_bin_get_child (GTK_BIN (window));
- gtk_widget_ref (ret);
- gtk_container_remove (window, ret);
- gtk_widget_destroy (GTK_WIDGET (window));
- return ret;
-}
-
static void
create_chat_room_tab (const char *room_name, const char *nick)
{
@@ -277,7 +262,7 @@
glade_xml_new (GNUNET_GTK_get_glade_filename (),
"chatFrame", PACKAGE_NAME);
GNUNET_GTK_connect_glade_with_plugins (client->chatXML);
- client->chatFrame = extractMainWidgetFromWindow (client->chatXML,
+ client->chatFrame = GNUNET_GTK_extract_main_widget_from_window
(client->chatXML,
"chatFrame");
chatLabel = gtk_label_new (room_name);
gtk_notebook_append_page (GTK_NOTEBOOK (chatnotebook),
Modified: gnunet-gtk/src/plugins/fs/meta.c
===================================================================
--- gnunet-gtk/src/plugins/fs/meta.c 2008-06-07 21:45:51 UTC (rev 7075)
+++ gnunet-gtk/src/plugins/fs/meta.c 2008-06-07 21:49:33 UTC (rev 7076)
@@ -505,20 +505,6 @@
return pixbuf;
}
-GtkWidget *
-extractMainWidgetFromWindow (GladeXML * xml, const char *windowName)
-{
- GtkContainer *window;
- GtkWidget *ret;
-
- window = GTK_CONTAINER (glade_xml_get_widget (xml, windowName));
- ret = gtk_bin_get_child (GTK_BIN (window));
- gtk_widget_ref (ret);
- gtk_container_remove (window, ret);
- gtk_widget_destroy (GTK_WIDGET (window));
- return ret;
-}
-
int
getToggleButtonValue (GladeXML * xml, const char *widgetName)
{
Modified: gnunet-gtk/src/plugins/fs/meta.h
===================================================================
--- gnunet-gtk/src/plugins/fs/meta.h 2008-06-07 21:45:51 UTC (rev 7075)
+++ gnunet-gtk/src/plugins/fs/meta.h 2008-06-07 21:49:33 UTC (rev 7076)
@@ -81,9 +81,5 @@
GdkPixbuf *getThumbnailFromMetaData (const struct GNUNET_MetaData *meta);
-GtkWidget *extractMainWidgetFromWindow (GladeXML * xml,
- const char *windowName);
-
-
/* end of meta.h */
#endif
Modified: gnunet-gtk/src/plugins/fs/namespace.c
===================================================================
--- gnunet-gtk/src/plugins/fs/namespace.c 2008-06-07 21:45:51 UTC (rev
7075)
+++ gnunet-gtk/src/plugins/fs/namespace.c 2008-06-07 21:49:33 UTC (rev
7076)
@@ -120,7 +120,7 @@
= glade_xml_new (GNUNET_GTK_get_glade_filename (),
"namespaceContentFrame", PACKAGE_NAME);
GNUNET_GTK_connect_glade_with_plugins (namespaceXML);
- child = extractMainWidgetFromWindow (namespaceXML, "namespaceContentFrame");
+ child = GNUNET_GTK_extract_main_widget_from_window (namespaceXML,
"namespaceContentFrame");
resultList = glade_xml_get_widget (namespaceXML,
"namespaceContentFrameTreeView");
entry->addButton = glade_xml_get_widget (namespaceXML, "addButton");
Modified: gnunet-gtk/src/plugins/fs/search.c
===================================================================
--- gnunet-gtk/src/plugins/fs/search.c 2008-06-07 21:45:51 UTC (rev 7075)
+++ gnunet-gtk/src/plugins/fs/search.c 2008-06-07 21:49:33 UTC (rev 7076)
@@ -711,7 +711,7 @@
PACKAGE_NAME);
GNUNET_GTK_connect_glade_with_plugins (list->searchXML);
list->searchpage
- = extractMainWidgetFromWindow (list->searchXML, "searchResultsFrame");
+ = GNUNET_GTK_extract_main_widget_from_window (list->searchXML,
"searchResultsFrame");
/* setup tree view and renderers */
list->treeview = GTK_TREE_VIEW (glade_xml_get_widget (list->searchXML,
"searchResults"));
@@ -935,7 +935,7 @@
"searchTabLabelWindow", PACKAGE_NAME);
GNUNET_GTK_connect_glade_with_plugins (list->labelXML);
list->tab_label
- = extractMainWidgetFromWindow (list->labelXML, "searchTabLabelWindow");
+ = GNUNET_GTK_extract_main_widget_from_window (list->labelXML,
"searchTabLabelWindow");
/* process existing results */
for (i = 0; i < resultCount; i++)
fs_search_result_received (list, &results[i], uri);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r7076 - in gnunet-gtk/src: common include plugins/chat plugins/fs,
gnunet <=