[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r2808 - GNUnet/src/conf
|
From: |
grothoff |
|
Subject: |
[GNUnet-SVN] r2808 - GNUnet/src/conf |
|
Date: |
Sun, 14 May 2006 03:13:59 -0700 (PDT) |
Author: grothoff
Date: 2006-05-14 03:13:53 -0700 (Sun, 14 May 2006)
New Revision: 2808
Added:
GNUnet/src/conf/glade_support.c
GNUnet/src/conf/glade_support.h
Removed:
GNUnet/src/conf/gconf.glade
GNUnet/src/conf/gconf_interface.c
GNUnet/src/conf/gconf_interface.h
GNUnet/src/conf/gconf_support.c
GNUnet/src/conf/gconf_support.h
Modified:
GNUnet/src/conf/Makefile.am
GNUnet/src/conf/gconf.c
GNUnet/src/conf/gconf.h
GNUnet/src/conf/wizard.glade
GNUnet/src/conf/wizard_gtk.c
Log:
about
Modified: GNUnet/src/conf/Makefile.am
===================================================================
--- GNUnet/src/conf/Makefile.am 2006-05-14 09:10:31 UTC (rev 2807)
+++ GNUnet/src/conf/Makefile.am 2006-05-14 10:13:53 UTC (rev 2808)
@@ -36,7 +36,6 @@
EXTRA_DIST = \
wizard.glade \
- gconf.glade \
images.c \
lex.zconf.c \
lkc_proto.h \
@@ -45,7 +44,6 @@
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
- $(INSTALL_DATA) gconf.glade $(DESTDIR)$(pkgdatadir)
$(INSTALL_DATA) wizard.glade $(DESTDIR)$(pkgdatadir)
@$(NORMAL_INSTALL)
@@ -103,9 +101,8 @@
libgnunetsetup.la
libgnunetsetup_gtk_la_SOURCES = \
- gconf_support.h \
- gconf_support.c \
gconf.c gconf.h \
+ glade_support.h glade_support.c \
wizard_gtk.c wizard_gtk.h
libgnunetsetup_gtk_la_LDFLAGS = \
Modified: GNUnet/src/conf/gconf.c
===================================================================
--- GNUnet/src/conf/gconf.c 2006-05-14 09:10:31 UTC (rev 2807)
+++ GNUnet/src/conf/gconf.c 2006-05-14 10:13:53 UTC (rev 2808)
@@ -28,6 +28,7 @@
* @file conf/gconf.c
* @author Roman Zippel
* @author Nils Durner
+ * @author Christian Grothoff
*/
#include "platform.h"
@@ -49,12 +50,9 @@
#define USE_XPM_VOID 1
#include "images.c"
-#include <gtk/gtk.h>
-#include <glib.h>
+#include "glade_support.h"
#include <gdk/gdkkeysyms.h>
-#include "gconf_interface.h"
-#include "gconf_support.h"
/* #define DEBUG */
@@ -274,8 +272,7 @@
/* Main Window Initialization */
-void init_main_window()
-{
+void init_main_window() {
GtkWidget *widget;
GtkTextBuffer *txtbuf;
char title[256];
@@ -283,47 +280,39 @@
GdkBitmap *mask;
GtkStyle *style;
GtkToolbar *toolbar;
- GtkWidget *vbox;
GtkMenu *options;
GtkImage *image;
- main_wnd = create_main_wnd ();
- gtk_widget_show(GTK_WIDGET(main_wnd));
+ main_wnd = get_xml("setupWindow");
- vbox = lookup_widget(GTK_WIDGET(main_wnd), "vbox1");
- hpaned = lookup_widget(GTK_WIDGET(vbox), "hpaned1");
- vpaned = lookup_widget(GTK_WIDGET(hpaned), "vpaned1");
- tree1_w = lookup_widget(lookup_widget(GTK_WIDGET(hpaned), "scrolledwindow1"),
- "treeview1");
- tree2_w = lookup_widget(lookup_widget(GTK_WIDGET(vpaned), "scrolledwindow2"),
- "treeview2");
- text_w = lookup_widget(lookup_widget(GTK_WIDGET(vpaned), "scrolledwindow3"),
- "textview3");
+ hpaned = lookup_widget("hpaned1");
+ vpaned = lookup_widget("vpaned1");
+ tree1_w = lookup_widget("treeview1");
+ tree2_w = lookup_widget("treeview2");
+ text_w = lookup_widget("textview3");
- toolbar = GTK_TOOLBAR(lookup_widget(lookup_widget(GTK_WIDGET(vbox),
- "handlebox1"), "toolbar1"));
+ toolbar = GTK_TOOLBAR(lookup_widget("toolbar1"));
- back_btn = lookup_widget(GTK_WIDGET(toolbar), "button1");
+ back_btn = lookup_widget("button1");
gtk_widget_set_sensitive(back_btn, FALSE);
- options = GTK_MENU(lookup_widget(lookup_widget(lookup_widget(vbox,
"menubar1"),
- "options1"), "options1_menu"));
+ options = GTK_MENU(lookup_widget("options1_menu"));
- widget = lookup_widget(GTK_WIDGET(options), "show_name1");
+ widget = lookup_widget("show_name1");
gtk_check_menu_item_set_active((GtkCheckMenuItem *) widget,
show_name);
- widget = lookup_widget(GTK_WIDGET(options), "show_range1");
+ widget = lookup_widget("show_range1");
gtk_check_menu_item_set_active((GtkCheckMenuItem *) widget,
show_range);
- widget = lookup_widget(GTK_WIDGET(options), "show_data1");
+ widget = lookup_widget("show_data1");
gtk_check_menu_item_set_active((GtkCheckMenuItem *) widget,
show_value);
style = gtk_widget_get_style(main_wnd);
- image = get_btn_image(GTK_BUTTON(lookup_widget(GTK_WIDGET(toolbar),
"button4")));
+ image = get_btn_image(GTK_BUTTON(lookup_widget("button4")));
if (image)
{
pixmap = gdk_pixmap_create_from_xpm_d(main_wnd->window, &mask,
@@ -332,7 +321,7 @@
gtk_image_set_from_pixmap(image, pixmap, mask);
}
- image = get_btn_image(GTK_BUTTON(lookup_widget(GTK_WIDGET(toolbar),
"button5")));
+ image = get_btn_image(GTK_BUTTON(lookup_widget("button5")));
if (image)
{
pixmap =
@@ -342,7 +331,7 @@
gtk_image_set_from_pixmap(image, pixmap, mask);
}
- image = get_btn_image(GTK_BUTTON(lookup_widget(GTK_WIDGET(toolbar),
"button6")));
+ image = get_btn_image(GTK_BUTTON(lookup_widget("button6")));
if (image)
{
pixmap =
@@ -352,7 +341,7 @@
gtk_image_set_from_pixmap(image, pixmap, mask);
}
- image = get_btn_image(GTK_BUTTON(lookup_widget(GTK_WIDGET(toolbar),
"button7")));
+ image = get_btn_image(GTK_BUTTON(lookup_widget("button7")));
if (image)
{
pixmap =
@@ -362,7 +351,7 @@
gtk_image_set_from_pixmap(image, pixmap, mask);
}
- image = get_btn_image(GTK_BUTTON(lookup_widget(GTK_WIDGET(toolbar),
"button8")));
+ image = get_btn_image(GTK_BUTTON(lookup_widget("button8")));
if (image)
{
pixmap =
@@ -375,15 +364,15 @@
switch (view_mode) {
case SINGLE_VIEW:
- widget = lookup_widget(GTK_WIDGET(toolbar), "button4");
+ widget = lookup_widget("button4");
gtk_button_clicked(GTK_BUTTON(widget));
break;
case SPLIT_VIEW:
- widget = lookup_widget(GTK_WIDGET(toolbar), "button5");
+ widget = lookup_widget("button5");
gtk_button_clicked(GTK_BUTTON(widget));
break;
case FULL_VIEW:
- widget = lookup_widget(GTK_WIDGET(toolbar), "button6");
+ widget = lookup_widget("button6");
gtk_button_clicked(GTK_BUTTON(widget));
break;
}
@@ -400,14 +389,6 @@
strcpy(title, "GNUnet Configuration");
gtk_window_set_title(GTK_WINDOW(main_wnd), title);
- set_help("GNUnet Setup", "",
- "This is GNUnet's configuration interface.\n"
- "GNUnet's options are separated into categories. You can browse "
- "them in the left tree. If you click on one of the categories, its "
- "options are shown above.\nTo change the value of an option, simply "
- "click on its value and enter a new value.\nTo get additional "
- "information about a specific option, click on its description.");
-
gtk_widget_show(main_wnd);
}
@@ -830,72 +811,18 @@
}
-void on_introduction1_activate(GtkMenuItem * menuitem, gpointer user_data)
-{
- GtkWidget *dialog;
- const gchar *intro_text =
- "Welcome to GNUnet Setup.\n"
- "For each option, a blank box indicates the feature is disabled, and\n"
- "checked one indicates it is enabled.\n"
- "If you do not see an option that you\n"
- "believe should be present, try turning on Show All Options\n"
- "under the Options menu.\n"
- "Although there is no cross reference yet to help you figure out\n"
- "what other options must be enabled to support the option you\n"
- "are interested in, you can still view the help of a grayed-out\n"
- "option.\n"
- "\n"
- "Toggling Show Debug Info under the Options menu will show \n"
- "the dependencies, which you can then match by examining other options.";
-
- dialog = gtk_message_dialog_new(GTK_WINDOW(main_wnd),
- GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_INFO,
- GTK_BUTTONS_CLOSE, intro_text);
- g_signal_connect_swapped(GTK_OBJECT(dialog), "response",
- G_CALLBACK(gtk_widget_destroy),
- GTK_OBJECT(dialog));
- gtk_widget_show_all(dialog);
+void on_introduction1_activate(GtkMenuItem * menuitem,
+ gpointer user_data) {
+ showDialog("introductionDialog");
}
-void on_about1_activate(GtkMenuItem * menuitem, gpointer user_data)
-{
- GtkWidget *dialog;
- const gchar *about_text =
- "(C) 2001-2005 Christian Grothoff (and other contributing authors).\n"
- "Based on source code from Roman Zippel and Romain Lievin.\n";
-
- dialog = gtk_message_dialog_new(GTK_WINDOW(main_wnd),
- GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_INFO,
- GTK_BUTTONS_CLOSE, about_text);
- g_signal_connect_swapped(GTK_OBJECT(dialog), "response",
- G_CALLBACK(gtk_widget_destroy),
- GTK_OBJECT(dialog));
- gtk_widget_show_all(dialog);
+void on_about1_activate(GtkMenuItem * menuitem,
+ gpointer user_data) {
+ showDialog("aboutdialog");
}
-void on_license1_activate(GtkMenuItem * menuitem, gpointer user_data)
-{
- GtkWidget *dialog;
- const gchar *license_text =
- "GNUnet is released under the terms of the GPL.\n"
- "For more information, please see the source code or\n"
- "visit http://www.fsf.org/licenses/licenses.html\n";;
-
- dialog = gtk_message_dialog_new(GTK_WINDOW(main_wnd),
- GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_INFO,
- GTK_BUTTONS_CLOSE, license_text);
- g_signal_connect_swapped(GTK_OBJECT(dialog), "response",
- G_CALLBACK(gtk_widget_destroy),
- GTK_OBJECT(dialog));
- gtk_widget_show_all(dialog);
-}
-
-
void on_back_pressed(GtkButton * button, gpointer user_data)
{
enum prop_type ptype;
@@ -1686,10 +1613,12 @@
/* Main */
-int gconf_main(int argc, char **argv)
-{
+int gconf_main(int argc,
+ char **argv,
+ void * lib) {
char * filename;
+ setLibrary(lib);
/* GTK stuffs */
gtk_init(&argc, &argv);
bind_textdomain_codeset(PACKAGE, "UTF-8");
@@ -1728,6 +1657,7 @@
gdk_threads_enter();
gtk_main();
gdk_threads_leave();
-
+ destroyMainXML();
+ setLibrary(NULL);
return 0;
}
Deleted: GNUnet/src/conf/gconf.glade
===================================================================
--- GNUnet/src/conf/gconf.glade 2006-05-14 09:10:31 UTC (rev 2807)
+++ GNUnet/src/conf/gconf.glade 2006-05-14 10:13:53 UTC (rev 2808)
@@ -1,1177 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd";>
-
-<glade-interface>
-
-<widget class="GtkWindow" id="main_wnd">
- <property name="visible">True</property>
- <property name="title" translatable="yes">Gtk GNUnet Configurator</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_NONE</property>
- <property name="modal">False</property>
- <property name="default_width">640</property>
- <property name="default_height">480</property>
- <property name="resizable">True</property>
- <property name="destroy_with_parent">False</property>
- <property name="decorated">True</property>
- <property name="skip_taskbar_hint">False</property>
- <property name="skip_pager_hint">False</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
- <property name="focus_on_map">True</property>
- <property name="urgency_hint">False</property>
- <signal name="destroy" handler="on_window1_destroy" object="main_wnd"/>
- <signal name="size_request" handler="on_window1_size_request"
object="vpaned1" last_modification_time="Fri, 11 Jan 2002 16:17:11 GMT"/>
- <signal name="delete_event" handler="on_window1_delete_event"
object="main_wnd" last_modification_time="Sun, 09 Mar 2003 19:42:46 GMT"/>
-
- <child>
- <widget class="GtkVBox" id="vbox1">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkMenuBar" id="menubar1">
- <property name="visible">True</property>
- <property name="pack_direction">GTK_PACK_DIRECTION_LTR</property>
- <property
name="child_pack_direction">GTK_PACK_DIRECTION_LTR</property>
-
- <child>
- <widget class="GtkMenuItem" id="file1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">_File</property>
- <property name="use_underline">True</property>
-
- <child>
- <widget class="GtkMenu" id="file1_menu">
-
- <child>
- <widget class="GtkImageMenuItem" id="load1">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Load a config
file</property>
- <property name="label" translatable="yes">_Load</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="on_load1_activate"/>
- <accelerator key="L" modifiers="GDK_CONTROL_MASK"
signal="activate"/>
-
- <child internal-child="image">
- <widget class="GtkImage" id="image27">
- <property name="visible">True</property>
- <property name="stock">gtk-open</property>
- <property name="icon_size">1</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkImageMenuItem" id="save1">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Save the
config in .config</property>
- <property name="label" translatable="yes">_Save</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="on_save1_activate"/>
- <accelerator key="S" modifiers="GDK_CONTROL_MASK"
signal="activate"/>
-
- <child internal-child="image">
- <widget class="GtkImage" id="image28">
- <property name="visible">True</property>
- <property name="stock">gtk-save</property>
- <property name="icon_size">1</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="separator1">
- <property name="visible">True</property>
- </widget>
- </child>
-
- <child>
- <widget class="GtkImageMenuItem" id="quit1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">_Quit</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="on_quit1_activate"/>
- <accelerator key="Q" modifiers="GDK_CONTROL_MASK"
signal="activate"/>
-
- <child internal-child="image">
- <widget class="GtkImage" id="image30">
- <property name="visible">True</property>
- <property name="stock">gtk-quit</property>
- <property name="icon_size">1</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="options1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">_Options</property>
- <property name="use_underline">True</property>
-
- <child>
- <widget class="GtkMenu" id="options1_menu">
-
- <child>
- <widget class="GtkCheckMenuItem" id="show_name1">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Show
name</property>
- <property name="label" translatable="yes">Show
_name</property>
- <property name="use_underline">True</property>
- <property name="active">False</property>
- <signal name="activate" handler="on_show_name1_activate"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkCheckMenuItem" id="show_range1">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Show range
(Y/M/N)</property>
- <property name="label" translatable="yes">Show
_range</property>
- <property name="use_underline">True</property>
- <property name="active">False</property>
- <signal name="activate"
handler="on_show_range1_activate"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkCheckMenuItem" id="show_data1">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Show value of
the option</property>
- <property name="label" translatable="yes">Show
_data</property>
- <property name="use_underline">True</property>
- <property name="active">False</property>
- <signal name="activate" handler="on_show_data1_activate"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="separator2">
- <property name="visible">True</property>
- </widget>
- </child>
-
- <child>
- <widget class="GtkCheckMenuItem" id="show_all_options1">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Show all
options</property>
- <property name="label" translatable="yes">Show all
_options</property>
- <property name="use_underline">True</property>
- <property name="active">False</property>
- <signal name="activate"
handler="on_show_all_options1_activate"/>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="help1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">_Help</property>
- <property name="use_underline">True</property>
-
- <child>
- <widget class="GtkMenu" id="help1_menu">
-
- <child>
- <widget class="GtkImageMenuItem" id="introduction1">
- <property name="visible">True</property>
- <property name="label"
translatable="yes">_Introduction</property>
- <property name="use_underline">True</property>
- <signal name="activate"
handler="on_introduction1_activate" last_modification_time="Fri, 15 Nov 2002
20:26:30 GMT"/>
- <accelerator key="I" modifiers="GDK_CONTROL_MASK"
signal="activate"/>
-
- <child internal-child="image">
- <widget class="GtkImage" id="image31">
- <property name="visible">True</property>
- <property name="stock">gtk-dialog-question</property>
- <property name="icon_size">1</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkImageMenuItem" id="about1">
- <property name="visible">True</property>
- <property name="label"
translatable="yes">_About</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="on_about1_activate"
last_modification_time="Fri, 15 Nov 2002 20:26:30 GMT"/>
- <accelerator key="A" modifiers="GDK_CONTROL_MASK"
signal="activate"/>
-
- <child internal-child="image">
- <widget class="GtkImage" id="image32">
- <property name="visible">True</property>
- <property name="stock">gtk-properties</property>
- <property name="icon_size">1</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkImageMenuItem" id="license1">
- <property name="visible">True</property>
- <property name="label"
translatable="yes">_License</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="on_license1_activate"
last_modification_time="Fri, 15 Nov 2002 20:26:30 GMT"/>
-
- <child internal-child="image">
- <widget class="GtkImage" id="image33">
- <property name="visible">True</property>
- <property name="stock">gtk-justify-fill</property>
- <property name="icon_size">1</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkHandleBox" id="handlebox1">
- <property name="visible">True</property>
- <property name="shadow_type">GTK_SHADOW_OUT</property>
- <property name="handle_position">GTK_POS_LEFT</property>
- <property name="snap_edge">GTK_POS_TOP</property>
-
- <child>
- <widget class="GtkToolbar" id="toolbar1">
- <property name="visible">True</property>
- <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
- <property name="toolbar_style">GTK_TOOLBAR_BOTH</property>
- <property name="tooltips">True</property>
- <property name="show_arrow">True</property>
-
- <child>
- <widget class="GtkToolItem" id="toolitem1">
- <property name="visible">True</property>
- <property name="visible_horizontal">True</property>
- <property name="visible_vertical">True</property>
- <property name="is_important">False</property>
-
- <child>
- <widget class="GtkButton" id="button1">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Goes up of
one level (single view)</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <signal name="pressed" handler="on_back_pressed"/>
-
- <child>
- <widget class="GtkAlignment" id="alignment11">
- <property name="visible">True</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <property name="top_padding">0</property>
- <property name="bottom_padding">0</property>
- <property name="left_padding">0</property>
- <property name="right_padding">0</property>
-
- <child>
- <widget class="GtkHBox" id="hbox11">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">2</property>
-
- <child>
- <widget class="GtkImage" id="image44">
- <property name="visible">True</property>
- <property name="stock">gtk-go-up</property>
- <property name="icon_size">4</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label11">
- <property name="visible">True</property>
- <property name="label"
translatable="yes">Up</property>
- <property name="use_underline">True</property>
- <property name="use_markup">False</property>
- <property
name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property
name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkToolItem" id="toolitem2">
- <property name="visible">True</property>
- <property name="visible_horizontal">True</property>
- <property name="visible_vertical">True</property>
- <property name="is_important">False</property>
-
- <child>
- <widget class="GtkVSeparator" id="vseparator1">
- <property name="visible">True</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkToolItem" id="toolitem3">
- <property name="visible">True</property>
- <property name="visible_horizontal">True</property>
- <property name="visible_vertical">True</property>
- <property name="is_important">False</property>
-
- <child>
- <widget class="GtkButton" id="button2">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Load a config
file</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <signal name="pressed" handler="on_load_pressed"/>
-
- <child>
- <widget class="GtkAlignment" id="alignment2">
- <property name="visible">True</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <property name="top_padding">0</property>
- <property name="bottom_padding">0</property>
- <property name="left_padding">0</property>
- <property name="right_padding">0</property>
-
- <child>
- <widget class="GtkHBox" id="hbox2">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">2</property>
-
- <child>
- <widget class="GtkImage" id="image35">
- <property name="visible">True</property>
- <property name="stock">gtk-open</property>
- <property name="icon_size">4</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label2">
- <property name="visible">True</property>
- <property name="label"
translatable="yes">Load</property>
- <property name="use_underline">True</property>
- <property name="use_markup">False</property>
- <property
name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property
name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkToolItem" id="toolitem4">
- <property name="visible">True</property>
- <property name="visible_horizontal">True</property>
- <property name="visible_vertical">True</property>
- <property name="is_important">False</property>
-
- <child>
- <widget class="GtkButton" id="button3">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Save a config
file</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <signal name="pressed" handler="on_save_pressed"/>
-
- <child>
- <widget class="GtkAlignment" id="alignment4">
- <property name="visible">True</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <property name="top_padding">0</property>
- <property name="bottom_padding">0</property>
- <property name="left_padding">0</property>
- <property name="right_padding">0</property>
-
- <child>
- <widget class="GtkHBox" id="hbox4">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">2</property>
-
- <child>
- <widget class="GtkImage" id="image37">
- <property name="visible">True</property>
- <property name="stock">gtk-save</property>
- <property name="icon_size">4</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label4">
- <property name="visible">True</property>
- <property name="label"
translatable="yes">Save</property>
- <property name="use_underline">True</property>
- <property name="use_markup">False</property>
- <property
name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property
name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkToolItem" id="toolitem5">
- <property name="visible">True</property>
- <property name="visible_horizontal">True</property>
- <property name="visible_vertical">True</property>
- <property name="is_important">False</property>
-
- <child>
- <widget class="GtkVSeparator" id="vseparator2">
- <property name="visible">True</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkToolItem" id="toolitem6">
- <property name="visible">True</property>
- <property name="visible_horizontal">True</property>
- <property name="visible_vertical">True</property>
- <property name="is_important">False</property>
-
- <child>
- <widget class="GtkButton" id="button4">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Single
view</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <signal name="clicked" handler="on_single_clicked"
last_modification_time="Sun, 12 Jan 2003 14:28:39 GMT"/>
-
- <child>
- <widget class="GtkAlignment" id="alignment6">
- <property name="visible">True</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <property name="top_padding">0</property>
- <property name="bottom_padding">0</property>
- <property name="left_padding">0</property>
- <property name="right_padding">0</property>
-
- <child>
- <widget class="GtkHBox" id="hbox6">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">2</property>
-
- <child>
- <widget class="GtkImage" id="image39">
- <property name="visible">True</property>
- <property
name="stock">gtk-justify-fill</property>
- <property name="icon_size">4</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label6">
- <property name="visible">True</property>
- <property name="label"
translatable="yes">Single</property>
- <property name="use_underline">True</property>
- <property name="use_markup">False</property>
- <property
name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property
name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkToolItem" id="toolitem7">
- <property name="visible">True</property>
- <property name="visible_horizontal">True</property>
- <property name="visible_vertical">True</property>
- <property name="is_important">False</property>
-
- <child>
- <widget class="GtkButton" id="button5">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Split
view</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <signal name="clicked" handler="on_split_clicked"
last_modification_time="Sun, 12 Jan 2003 14:28:45 GMT"/>
-
- <child>
- <widget class="GtkAlignment" id="alignment7">
- <property name="visible">True</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <property name="top_padding">0</property>
- <property name="bottom_padding">0</property>
- <property name="left_padding">0</property>
- <property name="right_padding">0</property>
-
- <child>
- <widget class="GtkHBox" id="hbox7">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">2</property>
-
- <child>
- <widget class="GtkImage" id="image40">
- <property name="visible">True</property>
- <property
name="stock">gtk-justify-fill</property>
- <property name="icon_size">4</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label7">
- <property name="visible">True</property>
- <property name="label"
translatable="yes">Split</property>
- <property name="use_underline">True</property>
- <property name="use_markup">False</property>
- <property
name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property
name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkToolItem" id="toolitem8">
- <property name="visible">True</property>
- <property name="visible_horizontal">True</property>
- <property name="visible_vertical">True</property>
- <property name="is_important">False</property>
-
- <child>
- <widget class="GtkButton" id="button6">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Full
view</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <signal name="clicked" handler="on_full_clicked"
last_modification_time="Sun, 12 Jan 2003 14:28:50 GMT"/>
-
- <child>
- <widget class="GtkAlignment" id="alignment8">
- <property name="visible">True</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <property name="top_padding">0</property>
- <property name="bottom_padding">0</property>
- <property name="left_padding">0</property>
- <property name="right_padding">0</property>
-
- <child>
- <widget class="GtkHBox" id="hbox8">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">2</property>
-
- <child>
- <widget class="GtkImage" id="image41">
- <property name="visible">True</property>
- <property
name="stock">gtk-justify-fill</property>
- <property name="icon_size">4</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label8">
- <property name="visible">True</property>
- <property name="label"
translatable="yes">Full</property>
- <property name="use_underline">True</property>
- <property name="use_markup">False</property>
- <property
name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property
name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkToolItem" id="toolitem9">
- <property name="visible">True</property>
- <property name="visible_horizontal">True</property>
- <property name="visible_vertical">True</property>
- <property name="is_important">False</property>
-
- <child>
- <widget class="GtkVSeparator" id="vseparator3">
- <property name="visible">True</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkToolItem" id="toolitem10">
- <property name="visible">True</property>
- <property name="visible_horizontal">True</property>
- <property name="visible_vertical">True</property>
- <property name="is_important">False</property>
-
- <child>
- <widget class="GtkButton" id="button7">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Collapse the
whole tree in the right frame</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <signal name="pressed" handler="on_collapse_pressed"/>
-
- <child>
- <widget class="GtkAlignment" id="alignment9">
- <property name="visible">True</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <property name="top_padding">0</property>
- <property name="bottom_padding">0</property>
- <property name="left_padding">0</property>
- <property name="right_padding">0</property>
-
- <child>
- <widget class="GtkHBox" id="hbox9">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">2</property>
-
- <child>
- <widget class="GtkImage" id="image42">
- <property name="visible">True</property>
- <property name="stock">gtk-remove</property>
- <property name="icon_size">4</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label9">
- <property name="visible">True</property>
- <property name="label"
translatable="yes">Collapse</property>
- <property name="use_underline">True</property>
- <property name="use_markup">False</property>
- <property
name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property
name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkToolItem" id="toolitem11">
- <property name="visible">True</property>
- <property name="visible_horizontal">True</property>
- <property name="visible_vertical">True</property>
- <property name="is_important">False</property>
-
- <child>
- <widget class="GtkButton" id="button8">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Expand the
whole tree in the right frame</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <signal name="pressed" handler="on_expand_pressed"/>
-
- <child>
- <widget class="GtkAlignment" id="alignment10">
- <property name="visible">True</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <property name="top_padding">0</property>
- <property name="bottom_padding">0</property>
- <property name="left_padding">0</property>
- <property name="right_padding">0</property>
-
- <child>
- <widget class="GtkHBox" id="hbox10">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">2</property>
-
- <child>
- <widget class="GtkImage" id="image43">
- <property name="visible">True</property>
- <property name="stock">gtk-add</property>
- <property name="icon_size">4</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label10">
- <property name="visible">True</property>
- <property name="label"
translatable="yes">Expand</property>
- <property name="use_underline">True</property>
- <property name="use_markup">False</property>
- <property
name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property
name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">False</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkHPaned" id="hpaned1">
- <property name="width_request">1</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="position">0</property>
-
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow1">
- <property name="visible">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
- <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
- <child>
- <widget class="GtkTreeView" id="treeview1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="headers_visible">True</property>
- <property name="rules_hint">False</property>
- <property name="reorderable">False</property>
- <property name="enable_search">True</property>
- <property name="fixed_height_mode">False</property>
- <property name="hover_selection">False</property>
- <property name="hover_expand">False</property>
- <signal name="cursor_changed"
handler="on_treeview2_cursor_changed" last_modification_time="Sun, 12 Jan 2003
15:58:22 GMT"/>
- <signal name="button_press_event"
handler="on_treeview1_button_press_event" last_modification_time="Sun, 12 Jan
2003 16:03:52 GMT"/>
- <signal name="key_press_event"
handler="on_treeview2_key_press_event" last_modification_time="Sun, 12 Jan 2003
16:11:44 GMT"/>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="shrink">True</property>
- <property name="resize">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkVPaned" id="vpaned1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="position">0</property>
-
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow2">
- <property name="visible">True</property>
- <property
name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
- <property
name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
- <property
name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
- <child>
- <widget class="GtkTreeView" id="treeview2">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="has_focus">True</property>
- <property name="headers_visible">True</property>
- <property name="rules_hint">False</property>
- <property name="reorderable">False</property>
- <property name="enable_search">True</property>
- <property name="fixed_height_mode">False</property>
- <property name="hover_selection">False</property>
- <property name="hover_expand">False</property>
- <signal name="cursor_changed"
handler="on_treeview2_cursor_changed" last_modification_time="Sun, 12 Jan 2003
15:57:55 GMT"/>
- <signal name="button_press_event"
handler="on_treeview2_button_press_event" last_modification_time="Sun, 12 Jan
2003 15:57:58 GMT"/>
- <signal name="key_press_event"
handler="on_treeview2_key_press_event" last_modification_time="Sun, 12 Jan 2003
15:58:01 GMT"/>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="shrink">True</property>
- <property name="resize">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow3">
- <property name="visible">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
- <property
name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
- <property
name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
- <child>
- <widget class="GtkTextView" id="textview3">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">False</property>
- <property name="overwrite">False</property>
- <property name="accepts_tab">True</property>
- <property name="justification">GTK_JUSTIFY_LEFT</property>
- <property name="wrap_mode">GTK_WRAP_WORD</property>
- <property name="cursor_visible">True</property>
- <property name="pixels_above_lines">0</property>
- <property name="pixels_below_lines">0</property>
- <property name="pixels_inside_wrap">0</property>
- <property name="left_margin">0</property>
- <property name="right_margin">0</property>
- <property name="indent">0</property>
- <property name="text" translatable="yes">Sorry, no help
available for this option yet.</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="shrink">True</property>
- <property name="resize">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="shrink">True</property>
- <property name="resize">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- </child>
-</widget>
-
-</glade-interface>
Modified: GNUnet/src/conf/gconf.h
===================================================================
--- GNUnet/src/conf/gconf.h 2006-05-14 09:10:31 UTC (rev 2807)
+++ GNUnet/src/conf/gconf.h 2006-05-14 10:13:53 UTC (rev 2808)
@@ -28,6 +28,6 @@
#ifndef GNUNET_SETUP_GCONF_H
#define GNUNET_SETUP_GCONF_H
-int gconf_main(int argc, char **argv);
+int gconf_main(int argc, char **argv, void * lib);
#endif
Deleted: GNUnet/src/conf/gconf_interface.c
===================================================================
--- GNUnet/src/conf/gconf_interface.c 2006-05-14 09:10:31 UTC (rev 2807)
+++ GNUnet/src/conf/gconf_interface.c 2006-05-14 10:13:53 UTC (rev 2808)
@@ -1,720 +0,0 @@
-/*
- * DO NOT EDIT THIS FILE - it is generated by Glade.
- */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#include <string.h>
-#include <stdio.h>
-
-#include <gdk/gdkkeysyms.h>
-#include <gtk/gtk.h>
-
-#include "gconf_callbacks.h"
-#include "gconf_interface.h"
-#include "gconf_support.h"
-
-#define GLADE_HOOKUP_OBJECT(component,widget,name) \
- g_object_set_data_full (G_OBJECT (component), name, \
- gtk_widget_ref (widget), (GDestroyNotify) gtk_widget_unref)
-
-#define GLADE_HOOKUP_OBJECT_NO_REF(component,widget,name) \
- g_object_set_data (G_OBJECT (component), name, widget)
-
-GtkWidget *
-create_main_wnd (void)
-{
- GtkWidget *main_wnd;
- GtkWidget *vbox1;
- GtkWidget *menubar1;
- GtkWidget *file1;
- GtkWidget *file1_menu;
- GtkWidget *load1;
- GtkWidget *image27;
- GtkWidget *save1;
- GtkWidget *image28;
- GtkWidget *separator1;
- GtkWidget *quit1;
- GtkWidget *image30;
- GtkWidget *options1;
- GtkWidget *options1_menu;
- GtkWidget *show_name1;
- GtkWidget *show_range1;
- GtkWidget *show_data1;
- GtkWidget *separator2;
- GtkWidget *show_all_options1;
- GtkWidget *help1;
- GtkWidget *help1_menu;
- GtkWidget *introduction1;
- GtkWidget *image31;
- GtkWidget *about1;
- GtkWidget *image32;
- GtkWidget *license1;
- GtkWidget *image33;
- GtkWidget *handlebox1;
- GtkWidget *toolbar1;
- GtkIconSize tmp_toolbar_icon_size;
- GtkWidget *toolitem1;
- GtkWidget *button1;
- GtkWidget *alignment11;
- GtkWidget *hbox11;
- GtkWidget *image44;
- GtkWidget *label11;
- GtkWidget *toolitem2;
- GtkWidget *vseparator1;
- GtkWidget *toolitem3;
- GtkWidget *button2;
- GtkWidget *alignment2;
- GtkWidget *hbox2;
- GtkWidget *image35;
- GtkWidget *label2;
- GtkWidget *toolitem4;
- GtkWidget *button3;
- GtkWidget *alignment4;
- GtkWidget *hbox4;
- GtkWidget *image37;
- GtkWidget *label4;
- GtkWidget *toolitem5;
- GtkWidget *vseparator2;
- GtkWidget *toolitem6;
- GtkWidget *button4;
- GtkWidget *alignment6;
- GtkWidget *hbox6;
- GtkWidget *image39;
- GtkWidget *label6;
- GtkWidget *toolitem7;
- GtkWidget *button5;
- GtkWidget *alignment7;
- GtkWidget *hbox7;
- GtkWidget *image40;
- GtkWidget *label7;
- GtkWidget *toolitem8;
- GtkWidget *button6;
- GtkWidget *alignment8;
- GtkWidget *hbox8;
- GtkWidget *image41;
- GtkWidget *label8;
- GtkWidget *toolitem9;
- GtkWidget *vseparator3;
- GtkWidget *toolitem10;
- GtkWidget *button7;
- GtkWidget *alignment9;
- GtkWidget *hbox9;
- GtkWidget *image42;
- GtkWidget *label9;
- GtkWidget *toolitem11;
- GtkWidget *button8;
- GtkWidget *alignment10;
- GtkWidget *hbox10;
- GtkWidget *image43;
- GtkWidget *label10;
- GtkWidget *hpaned1;
- GtkWidget *scrolledwindow1;
- GtkWidget *treeview1;
- GtkWidget *vpaned1;
- GtkWidget *scrolledwindow2;
- GtkWidget *treeview2;
- GtkWidget *scrolledwindow3;
- GtkWidget *textview3;
- GtkAccelGroup *accel_group;
- GtkTooltips *tooltips;
-
- tooltips = gtk_tooltips_new ();
-
- accel_group = gtk_accel_group_new ();
-
- main_wnd = gtk_window_new (GTK_WINDOW_TOPLEVEL);
- gtk_window_set_title (GTK_WINDOW (main_wnd), _("Gtk GNUnet Configurator"));
- gtk_window_set_default_size (GTK_WINDOW (main_wnd), 640, 480);
-
- vbox1 = gtk_vbox_new (FALSE, 0);
- gtk_widget_show (vbox1);
- gtk_container_add (GTK_CONTAINER (main_wnd), vbox1);
-
- menubar1 = gtk_menu_bar_new ();
- gtk_widget_show (menubar1);
- gtk_box_pack_start (GTK_BOX (vbox1), menubar1, FALSE, FALSE, 0);
-
- file1 = gtk_menu_item_new_with_mnemonic (_("_File"));
- gtk_widget_show (file1);
- gtk_container_add (GTK_CONTAINER (menubar1), file1);
-
- file1_menu = gtk_menu_new ();
- gtk_menu_item_set_submenu (GTK_MENU_ITEM (file1), file1_menu);
-
- load1 = gtk_image_menu_item_new_with_mnemonic (_("_Load"));
- gtk_widget_show (load1);
- gtk_container_add (GTK_CONTAINER (file1_menu), load1);
- gtk_tooltips_set_tip (tooltips, load1, _("Load a config file"), NULL);
- gtk_widget_add_accelerator (load1, "activate", accel_group,
- GDK_L, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
-
- image27 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image27);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (load1), image27);
-
- save1 = gtk_image_menu_item_new_with_mnemonic (_("_Save"));
- gtk_widget_show (save1);
- gtk_container_add (GTK_CONTAINER (file1_menu), save1);
- gtk_tooltips_set_tip (tooltips, save1, _("Save the config in .config"),
- NULL);
- gtk_widget_add_accelerator (save1, "activate", accel_group, GDK_S,
- GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
-
- image28 = gtk_image_new_from_stock ("gtk-save", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image28);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (save1), image28);
-
- separator1 = gtk_menu_item_new ();
- gtk_widget_show (separator1);
- gtk_container_add (GTK_CONTAINER (file1_menu), separator1);
- gtk_widget_set_sensitive (separator1, FALSE);
-
- quit1 = gtk_image_menu_item_new_with_mnemonic (_("_Quit"));
- gtk_widget_show (quit1);
- gtk_container_add (GTK_CONTAINER (file1_menu), quit1);
- gtk_widget_add_accelerator (quit1, "activate", accel_group,
- GDK_Q, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
-
- image30 = gtk_image_new_from_stock ("gtk-quit", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image30);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (quit1), image30);
-
- options1 = gtk_menu_item_new_with_mnemonic (_("_Options"));
- gtk_widget_show (options1);
- gtk_container_add (GTK_CONTAINER (menubar1), options1);
-
- options1_menu = gtk_menu_new ();
- gtk_menu_item_set_submenu (GTK_MENU_ITEM (options1), options1_menu);
-
- show_name1 = gtk_check_menu_item_new_with_mnemonic (_("Show _name"));
- gtk_widget_show (show_name1);
- gtk_container_add (GTK_CONTAINER (options1_menu), show_name1);
- gtk_tooltips_set_tip (tooltips, show_name1, _("Show name"), NULL);
-
- show_range1 = gtk_check_menu_item_new_with_mnemonic (_("Show _range"));
- gtk_widget_show (show_range1);
- gtk_container_add (GTK_CONTAINER (options1_menu), show_range1);
- gtk_tooltips_set_tip (tooltips, show_range1, _("Show range (Y/M/N)"), NULL);
-
- show_data1 = gtk_check_menu_item_new_with_mnemonic (_("Show _data"));
- gtk_widget_show (show_data1);
- gtk_container_add (GTK_CONTAINER (options1_menu), show_data1);
- gtk_tooltips_set_tip (tooltips, show_data1, _("Show value of the option"),
- NULL);
-
- separator2 = gtk_menu_item_new ();
- gtk_widget_show (separator2);
- gtk_container_add (GTK_CONTAINER (options1_menu), separator2);
- gtk_widget_set_sensitive (separator2, FALSE);
-
- show_all_options1 =
- gtk_check_menu_item_new_with_mnemonic (_("Show all _options"));
- gtk_widget_show (show_all_options1);
- gtk_container_add (GTK_CONTAINER (options1_menu), show_all_options1);
- gtk_tooltips_set_tip (tooltips, show_all_options1, _("Show all options"),
- NULL);
-
- help1 = gtk_menu_item_new_with_mnemonic (_("_Help"));
- gtk_widget_show (help1);
- gtk_container_add (GTK_CONTAINER (menubar1), help1);
-
- help1_menu = gtk_menu_new ();
- gtk_menu_item_set_submenu (GTK_MENU_ITEM (help1), help1_menu);
-
- introduction1 = gtk_image_menu_item_new_with_mnemonic (_("_Introduction"));
- gtk_widget_show (introduction1);
- gtk_container_add (GTK_CONTAINER (help1_menu), introduction1);
- gtk_widget_add_accelerator (introduction1, "activate", accel_group,
- GDK_I, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
-
- image31 =
- gtk_image_new_from_stock ("gtk-dialog-question", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image31);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (introduction1),
- image31);
-
- about1 = gtk_image_menu_item_new_with_mnemonic (_("_About"));
- gtk_widget_show (about1);
- gtk_container_add (GTK_CONTAINER (help1_menu), about1);
- gtk_widget_add_accelerator (about1, "activate", accel_group,
- GDK_A, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
-
- image32 = gtk_image_new_from_stock ("gtk-properties", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image32);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (about1), image32);
-
- license1 = gtk_image_menu_item_new_with_mnemonic (_("_License"));
- gtk_widget_show (license1);
- gtk_container_add (GTK_CONTAINER (help1_menu), license1);
-
- image33 = gtk_image_new_from_stock ("gtk-justify-fill", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image33);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (license1), image33);
-
- handlebox1 = gtk_handle_box_new ();
- gtk_widget_show (handlebox1);
- gtk_box_pack_start (GTK_BOX (vbox1), handlebox1, FALSE, FALSE, 0);
-
- toolbar1 = gtk_toolbar_new ();
- gtk_widget_show (toolbar1);
- gtk_container_add (GTK_CONTAINER (handlebox1), toolbar1);
- gtk_toolbar_set_style (GTK_TOOLBAR (toolbar1), GTK_TOOLBAR_BOTH);
- tmp_toolbar_icon_size = gtk_toolbar_get_icon_size (GTK_TOOLBAR (toolbar1));
-
- toolitem1 = (GtkWidget *) gtk_tool_item_new ();
- gtk_widget_show (toolitem1);
- gtk_container_add (GTK_CONTAINER (toolbar1), toolitem1);
-
- button1 = gtk_button_new ();
- gtk_widget_show (button1);
- gtk_container_add (GTK_CONTAINER (toolitem1), button1);
- GTK_WIDGET_UNSET_FLAGS (button1, GTK_CAN_FOCUS);
- gtk_tooltips_set_tip (tooltips, button1,
- _("Goes up of one level (single view)"), NULL);
-
- alignment11 = gtk_alignment_new (0.5, 0.5, 0, 0);
- gtk_widget_show (alignment11);
- gtk_container_add (GTK_CONTAINER (button1), alignment11);
-
- hbox11 = gtk_hbox_new (FALSE, 2);
- gtk_widget_show (hbox11);
- gtk_container_add (GTK_CONTAINER (alignment11), hbox11);
-
- image44 = gtk_image_new_from_stock ("gtk-go-up", GTK_ICON_SIZE_BUTTON);
- gtk_widget_show (image44);
- gtk_box_pack_start (GTK_BOX (hbox11), image44, FALSE, FALSE, 0);
-
- label11 = gtk_label_new_with_mnemonic (_("Up"));
- gtk_widget_show (label11);
- gtk_box_pack_start (GTK_BOX (hbox11), label11, FALSE, FALSE, 0);
-
- toolitem2 = (GtkWidget *) gtk_tool_item_new ();
- gtk_widget_show (toolitem2);
- gtk_container_add (GTK_CONTAINER (toolbar1), toolitem2);
-
- vseparator1 = gtk_vseparator_new ();
- gtk_widget_show (vseparator1);
- gtk_container_add (GTK_CONTAINER (toolitem2), vseparator1);
-
- toolitem3 = (GtkWidget *) gtk_tool_item_new ();
- gtk_widget_show (toolitem3);
- gtk_container_add (GTK_CONTAINER (toolbar1), toolitem3);
-
- button2 = gtk_button_new ();
- gtk_widget_show (button2);
- gtk_container_add (GTK_CONTAINER (toolitem3), button2);
- GTK_WIDGET_UNSET_FLAGS (button2, GTK_CAN_FOCUS);
- gtk_tooltips_set_tip (tooltips, button2, _("Load a config file"), NULL);
-
- alignment2 = gtk_alignment_new (0.5, 0.5, 0, 0);
- gtk_widget_show (alignment2);
- gtk_container_add (GTK_CONTAINER (button2), alignment2);
-
- hbox2 = gtk_hbox_new (FALSE, 2);
- gtk_widget_show (hbox2);
- gtk_container_add (GTK_CONTAINER (alignment2), hbox2);
-
- image35 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_BUTTON);
- gtk_widget_show (image35);
- gtk_box_pack_start (GTK_BOX (hbox2), image35, FALSE, FALSE, 0);
-
- label2 = gtk_label_new_with_mnemonic (_("Load"));
- gtk_widget_show (label2);
- gtk_box_pack_start (GTK_BOX (hbox2), label2, FALSE, FALSE, 0);
-
- toolitem4 = (GtkWidget *) gtk_tool_item_new ();
- gtk_widget_show (toolitem4);
- gtk_container_add (GTK_CONTAINER (toolbar1), toolitem4);
-
- button3 = gtk_button_new ();
- gtk_widget_show (button3);
- gtk_container_add (GTK_CONTAINER (toolitem4), button3);
- GTK_WIDGET_UNSET_FLAGS (button3, GTK_CAN_FOCUS);
- gtk_tooltips_set_tip (tooltips, button3, _("Save a config file"), NULL);
-
- alignment4 = gtk_alignment_new (0.5, 0.5, 0, 0);
- gtk_widget_show (alignment4);
- gtk_container_add (GTK_CONTAINER (button3), alignment4);
-
- hbox4 = gtk_hbox_new (FALSE, 2);
- gtk_widget_show (hbox4);
- gtk_container_add (GTK_CONTAINER (alignment4), hbox4);
-
- image37 = gtk_image_new_from_stock ("gtk-save", GTK_ICON_SIZE_BUTTON);
- gtk_widget_show (image37);
- gtk_box_pack_start (GTK_BOX (hbox4), image37, FALSE, FALSE, 0);
-
- label4 = gtk_label_new_with_mnemonic (_("Save"));
- gtk_widget_show (label4);
- gtk_box_pack_start (GTK_BOX (hbox4), label4, FALSE, FALSE, 0);
-
- toolitem5 = (GtkWidget *) gtk_tool_item_new ();
- gtk_widget_show (toolitem5);
- gtk_container_add (GTK_CONTAINER (toolbar1), toolitem5);
-
- vseparator2 = gtk_vseparator_new ();
- gtk_widget_show (vseparator2);
- gtk_container_add (GTK_CONTAINER (toolitem5), vseparator2);
-
- toolitem6 = (GtkWidget *) gtk_tool_item_new ();
- gtk_widget_show (toolitem6);
- gtk_container_add (GTK_CONTAINER (toolbar1), toolitem6);
-
- button4 = gtk_button_new ();
- gtk_widget_show (button4);
- gtk_container_add (GTK_CONTAINER (toolitem6), button4);
- GTK_WIDGET_UNSET_FLAGS (button4, GTK_CAN_FOCUS);
- gtk_tooltips_set_tip (tooltips, button4, _("Single view"), NULL);
-
- alignment6 = gtk_alignment_new (0.5, 0.5, 0, 0);
- gtk_widget_show (alignment6);
- gtk_container_add (GTK_CONTAINER (button4), alignment6);
-
- hbox6 = gtk_hbox_new (FALSE, 2);
- gtk_widget_show (hbox6);
- gtk_container_add (GTK_CONTAINER (alignment6), hbox6);
-
- image39 =
- gtk_image_new_from_stock ("gtk-justify-fill", GTK_ICON_SIZE_BUTTON);
- gtk_widget_show (image39);
- gtk_box_pack_start (GTK_BOX (hbox6), image39, FALSE, FALSE, 0);
-
- label6 = gtk_label_new_with_mnemonic (_("Single"));
- gtk_widget_show (label6);
- gtk_box_pack_start (GTK_BOX (hbox6), label6, FALSE, FALSE, 0);
-
- toolitem7 = (GtkWidget *) gtk_tool_item_new ();
- gtk_widget_show (toolitem7);
- gtk_container_add (GTK_CONTAINER (toolbar1), toolitem7);
-
- button5 = gtk_button_new ();
- gtk_widget_show (button5);
- gtk_container_add (GTK_CONTAINER (toolitem7), button5);
- GTK_WIDGET_UNSET_FLAGS (button5, GTK_CAN_FOCUS);
- gtk_tooltips_set_tip (tooltips, button5, _("Split view"), NULL);
-
- alignment7 = gtk_alignment_new (0.5, 0.5, 0, 0);
- gtk_widget_show (alignment7);
- gtk_container_add (GTK_CONTAINER (button5), alignment7);
-
- hbox7 = gtk_hbox_new (FALSE, 2);
- gtk_widget_show (hbox7);
- gtk_container_add (GTK_CONTAINER (alignment7), hbox7);
-
- image40 =
- gtk_image_new_from_stock ("gtk-justify-fill", GTK_ICON_SIZE_BUTTON);
- gtk_widget_show (image40);
- gtk_box_pack_start (GTK_BOX (hbox7), image40, FALSE, FALSE, 0);
-
- label7 = gtk_label_new_with_mnemonic (_("Split"));
- gtk_widget_show (label7);
- gtk_box_pack_start (GTK_BOX (hbox7), label7, FALSE, FALSE, 0);
-
- toolitem8 = (GtkWidget *) gtk_tool_item_new ();
- gtk_widget_show (toolitem8);
- gtk_container_add (GTK_CONTAINER (toolbar1), toolitem8);
-
- button6 = gtk_button_new ();
- gtk_widget_show (button6);
- gtk_container_add (GTK_CONTAINER (toolitem8), button6);
- GTK_WIDGET_UNSET_FLAGS (button6, GTK_CAN_FOCUS);
- gtk_tooltips_set_tip (tooltips, button6, _("Full view"), NULL);
-
- alignment8 = gtk_alignment_new (0.5, 0.5, 0, 0);
- gtk_widget_show (alignment8);
- gtk_container_add (GTK_CONTAINER (button6), alignment8);
-
- hbox8 = gtk_hbox_new (FALSE, 2);
- gtk_widget_show (hbox8);
- gtk_container_add (GTK_CONTAINER (alignment8), hbox8);
-
- image41 =
- gtk_image_new_from_stock ("gtk-justify-fill", GTK_ICON_SIZE_BUTTON);
- gtk_widget_show (image41);
- gtk_box_pack_start (GTK_BOX (hbox8), image41, FALSE, FALSE, 0);
-
- label8 = gtk_label_new_with_mnemonic (_("Full"));
- gtk_widget_show (label8);
- gtk_box_pack_start (GTK_BOX (hbox8), label8, FALSE, FALSE, 0);
-
- toolitem9 = (GtkWidget *) gtk_tool_item_new ();
- gtk_widget_show (toolitem9);
- gtk_container_add (GTK_CONTAINER (toolbar1), toolitem9);
-
- vseparator3 = gtk_vseparator_new ();
- gtk_widget_show (vseparator3);
- gtk_container_add (GTK_CONTAINER (toolitem9), vseparator3);
-
- toolitem10 = (GtkWidget *) gtk_tool_item_new ();
- gtk_widget_show (toolitem10);
- gtk_container_add (GTK_CONTAINER (toolbar1), toolitem10);
-
- button7 = gtk_button_new ();
- gtk_widget_show (button7);
- gtk_container_add (GTK_CONTAINER (toolitem10), button7);
- GTK_WIDGET_UNSET_FLAGS (button7, GTK_CAN_FOCUS);
- gtk_tooltips_set_tip (tooltips, button7,
- _("Collapse the whole tree in the right frame"),
- NULL);
-
- alignment9 = gtk_alignment_new (0.5, 0.5, 0, 0);
- gtk_widget_show (alignment9);
- gtk_container_add (GTK_CONTAINER (button7), alignment9);
-
- hbox9 = gtk_hbox_new (FALSE, 2);
- gtk_widget_show (hbox9);
- gtk_container_add (GTK_CONTAINER (alignment9), hbox9);
-
- image42 = gtk_image_new_from_stock ("gtk-remove", GTK_ICON_SIZE_BUTTON);
- gtk_widget_show (image42);
- gtk_box_pack_start (GTK_BOX (hbox9), image42, FALSE, FALSE, 0);
-
- label9 = gtk_label_new_with_mnemonic (_("Collapse"));
- gtk_widget_show (label9);
- gtk_box_pack_start (GTK_BOX (hbox9), label9, FALSE, FALSE, 0);
-
- toolitem11 = (GtkWidget *) gtk_tool_item_new ();
- gtk_widget_show (toolitem11);
- gtk_container_add (GTK_CONTAINER (toolbar1), toolitem11);
-
- button8 = gtk_button_new ();
- gtk_widget_show (button8);
- gtk_container_add (GTK_CONTAINER (toolitem11), button8);
- GTK_WIDGET_UNSET_FLAGS (button8, GTK_CAN_FOCUS);
- gtk_tooltips_set_tip (tooltips, button8,
- _("Expand the whole tree in the right frame"), NULL);
-
- alignment10 = gtk_alignment_new (0.5, 0.5, 0, 0);
- gtk_widget_show (alignment10);
- gtk_container_add (GTK_CONTAINER (button8), alignment10);
-
- hbox10 = gtk_hbox_new (FALSE, 2);
- gtk_widget_show (hbox10);
- gtk_container_add (GTK_CONTAINER (alignment10), hbox10);
-
- image43 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_BUTTON);
- gtk_widget_show (image43);
- gtk_box_pack_start (GTK_BOX (hbox10), image43, FALSE, FALSE, 0);
-
- label10 = gtk_label_new_with_mnemonic (_("Expand"));
- gtk_widget_show (label10);
- gtk_box_pack_start (GTK_BOX (hbox10), label10, FALSE, FALSE, 0);
-
- hpaned1 = gtk_hpaned_new ();
- gtk_widget_show (hpaned1);
- gtk_box_pack_start (GTK_BOX (vbox1), hpaned1, TRUE, TRUE, 0);
- gtk_widget_set_size_request (hpaned1, 1, -1);
- gtk_paned_set_position (GTK_PANED (hpaned1), 0);
-
- scrolledwindow1 = gtk_scrolled_window_new (NULL, NULL);
- gtk_widget_show (scrolledwindow1);
- gtk_paned_pack1 (GTK_PANED (hpaned1), scrolledwindow1, FALSE, TRUE);
- GTK_WIDGET_UNSET_FLAGS (scrolledwindow1, GTK_CAN_FOCUS);
- gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolledwindow1),
- GTK_SHADOW_IN);
-
- treeview1 = gtk_tree_view_new ();
- gtk_widget_show (treeview1);
- gtk_container_add (GTK_CONTAINER (scrolledwindow1), treeview1);
-
- vpaned1 = gtk_vpaned_new ();
- gtk_widget_show (vpaned1);
- gtk_paned_pack2 (GTK_PANED (hpaned1), vpaned1, TRUE, TRUE);
- gtk_paned_set_position (GTK_PANED (vpaned1), 0);
-
- scrolledwindow2 = gtk_scrolled_window_new (NULL, NULL);
- gtk_widget_show (scrolledwindow2);
- gtk_paned_pack1 (GTK_PANED (vpaned1), scrolledwindow2, FALSE, TRUE);
- GTK_WIDGET_UNSET_FLAGS (scrolledwindow2, GTK_CAN_FOCUS);
- gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolledwindow2),
- GTK_SHADOW_IN);
-
- treeview2 = gtk_tree_view_new ();
- gtk_widget_show (treeview2);
- gtk_container_add (GTK_CONTAINER (scrolledwindow2), treeview2);
-
- scrolledwindow3 = gtk_scrolled_window_new (NULL, NULL);
- gtk_widget_show (scrolledwindow3);
- gtk_paned_pack2 (GTK_PANED (vpaned1), scrolledwindow3, TRUE, TRUE);
- GTK_WIDGET_UNSET_FLAGS (scrolledwindow3, GTK_CAN_FOCUS);
- gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow3),
- GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
- gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolledwindow3),
- GTK_SHADOW_IN);
-
- textview3 = gtk_text_view_new ();
- gtk_widget_show (textview3);
- gtk_container_add (GTK_CONTAINER (scrolledwindow3), textview3);
- gtk_text_view_set_editable (GTK_TEXT_VIEW (textview3), FALSE);
- gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (textview3), GTK_WRAP_WORD);
- gtk_text_buffer_set_text (gtk_text_view_get_buffer
- (GTK_TEXT_VIEW (textview3)),
- _
- ("Sorry, no help available for this option yet."),
- -1);
-
- g_signal_connect_swapped ((gpointer) main_wnd, "destroy",
- G_CALLBACK (on_window1_destroy),
- GTK_OBJECT (main_wnd));
- g_signal_connect_swapped ((gpointer) main_wnd, "size_request",
- G_CALLBACK (on_window1_size_request),
- GTK_OBJECT (vpaned1));
- g_signal_connect_swapped ((gpointer) main_wnd, "delete_event",
- G_CALLBACK (on_window1_delete_event),
- GTK_OBJECT (main_wnd));
- g_signal_connect ((gpointer) load1, "activate",
- G_CALLBACK (on_load1_activate), NULL);
- g_signal_connect ((gpointer) save1, "activate",
- G_CALLBACK (on_save1_activate), NULL);
- g_signal_connect ((gpointer) quit1, "activate",
- G_CALLBACK (on_quit1_activate), NULL);
- g_signal_connect ((gpointer) show_name1, "activate",
- G_CALLBACK (on_show_name1_activate), NULL);
- g_signal_connect ((gpointer) show_range1, "activate",
- G_CALLBACK (on_show_range1_activate), NULL);
- g_signal_connect ((gpointer) show_data1, "activate",
- G_CALLBACK (on_show_data1_activate), NULL);
- g_signal_connect ((gpointer) show_all_options1, "activate",
- G_CALLBACK (on_show_all_options1_activate), NULL);
- g_signal_connect ((gpointer) introduction1, "activate",
- G_CALLBACK (on_introduction1_activate), NULL);
- g_signal_connect ((gpointer) about1, "activate",
- G_CALLBACK (on_about1_activate), NULL);
- g_signal_connect ((gpointer) license1, "activate",
- G_CALLBACK (on_license1_activate), NULL);
- g_signal_connect ((gpointer) button1, "pressed",
- G_CALLBACK (on_back_pressed), NULL);
- g_signal_connect ((gpointer) button2, "pressed",
- G_CALLBACK (on_load_pressed), NULL);
- g_signal_connect ((gpointer) button3, "pressed",
- G_CALLBACK (on_save_pressed), NULL);
- g_signal_connect ((gpointer) button4, "clicked",
- G_CALLBACK (on_single_clicked), NULL);
- g_signal_connect ((gpointer) button5, "clicked",
- G_CALLBACK (on_split_clicked), NULL);
- g_signal_connect ((gpointer) button6, "clicked",
- G_CALLBACK (on_full_clicked), NULL);
- g_signal_connect ((gpointer) button7, "pressed",
- G_CALLBACK (on_collapse_pressed), NULL);
- g_signal_connect ((gpointer) button8, "pressed",
- G_CALLBACK (on_expand_pressed), NULL);
- g_signal_connect ((gpointer) treeview1, "cursor_changed",
- G_CALLBACK (on_treeview2_cursor_changed), NULL);
- g_signal_connect ((gpointer) treeview1, "button_press_event",
- G_CALLBACK (on_treeview1_button_press_event), NULL);
- g_signal_connect ((gpointer) treeview1, "key_press_event",
- G_CALLBACK (on_treeview2_key_press_event), NULL);
- g_signal_connect ((gpointer) treeview2, "cursor_changed",
- G_CALLBACK (on_treeview2_cursor_changed), NULL);
- g_signal_connect ((gpointer) treeview2, "button_press_event",
- G_CALLBACK (on_treeview2_button_press_event), NULL);
- g_signal_connect ((gpointer) treeview2, "key_press_event",
- G_CALLBACK (on_treeview2_key_press_event), NULL);
-
- /* Store pointers to all widgets, for use by lookup_widget(). */
- GLADE_HOOKUP_OBJECT_NO_REF (main_wnd, main_wnd, "main_wnd");
- GLADE_HOOKUP_OBJECT (main_wnd, vbox1, "vbox1");
- GLADE_HOOKUP_OBJECT (main_wnd, menubar1, "menubar1");
- GLADE_HOOKUP_OBJECT (main_wnd, file1, "file1");
- GLADE_HOOKUP_OBJECT (main_wnd, file1_menu, "file1_menu");
- GLADE_HOOKUP_OBJECT (main_wnd, load1, "load1");
- GLADE_HOOKUP_OBJECT (main_wnd, image27, "image27");
- GLADE_HOOKUP_OBJECT (main_wnd, save1, "save1");
- GLADE_HOOKUP_OBJECT (main_wnd, image28, "image28");
- GLADE_HOOKUP_OBJECT (main_wnd, separator1, "separator1");
- GLADE_HOOKUP_OBJECT (main_wnd, quit1, "quit1");
- GLADE_HOOKUP_OBJECT (main_wnd, image30, "image30");
- GLADE_HOOKUP_OBJECT (main_wnd, options1, "options1");
- GLADE_HOOKUP_OBJECT (main_wnd, options1_menu, "options1_menu");
- GLADE_HOOKUP_OBJECT (main_wnd, show_name1, "show_name1");
- GLADE_HOOKUP_OBJECT (main_wnd, show_range1, "show_range1");
- GLADE_HOOKUP_OBJECT (main_wnd, show_data1, "show_data1");
- GLADE_HOOKUP_OBJECT (main_wnd, separator2, "separator2");
- GLADE_HOOKUP_OBJECT (main_wnd, show_all_options1, "show_all_options1");
- GLADE_HOOKUP_OBJECT (main_wnd, help1, "help1");
- GLADE_HOOKUP_OBJECT (main_wnd, help1_menu, "help1_menu");
- GLADE_HOOKUP_OBJECT (main_wnd, introduction1, "introduction1");
- GLADE_HOOKUP_OBJECT (main_wnd, image31, "image31");
- GLADE_HOOKUP_OBJECT (main_wnd, about1, "about1");
- GLADE_HOOKUP_OBJECT (main_wnd, image32, "image32");
- GLADE_HOOKUP_OBJECT (main_wnd, license1, "license1");
- GLADE_HOOKUP_OBJECT (main_wnd, image33, "image33");
- GLADE_HOOKUP_OBJECT (main_wnd, handlebox1, "handlebox1");
- GLADE_HOOKUP_OBJECT (main_wnd, toolbar1, "toolbar1");
- GLADE_HOOKUP_OBJECT (main_wnd, toolitem1, "toolitem1");
- GLADE_HOOKUP_OBJECT (main_wnd, button1, "button1");
- GLADE_HOOKUP_OBJECT (main_wnd, alignment11, "alignment11");
- GLADE_HOOKUP_OBJECT (main_wnd, hbox11, "hbox11");
- GLADE_HOOKUP_OBJECT (main_wnd, image44, "image44");
- GLADE_HOOKUP_OBJECT (main_wnd, label11, "label11");
- GLADE_HOOKUP_OBJECT (main_wnd, toolitem2, "toolitem2");
- GLADE_HOOKUP_OBJECT (main_wnd, vseparator1, "vseparator1");
- GLADE_HOOKUP_OBJECT (main_wnd, toolitem3, "toolitem3");
- GLADE_HOOKUP_OBJECT (main_wnd, button2, "button2");
- GLADE_HOOKUP_OBJECT (main_wnd, alignment2, "alignment2");
- GLADE_HOOKUP_OBJECT (main_wnd, hbox2, "hbox2");
- GLADE_HOOKUP_OBJECT (main_wnd, image35, "image35");
- GLADE_HOOKUP_OBJECT (main_wnd, label2, "label2");
- GLADE_HOOKUP_OBJECT (main_wnd, toolitem4, "toolitem4");
- GLADE_HOOKUP_OBJECT (main_wnd, button3, "button3");
- GLADE_HOOKUP_OBJECT (main_wnd, alignment4, "alignment4");
- GLADE_HOOKUP_OBJECT (main_wnd, hbox4, "hbox4");
- GLADE_HOOKUP_OBJECT (main_wnd, image37, "image37");
- GLADE_HOOKUP_OBJECT (main_wnd, label4, "label4");
- GLADE_HOOKUP_OBJECT (main_wnd, toolitem5, "toolitem5");
- GLADE_HOOKUP_OBJECT (main_wnd, vseparator2, "vseparator2");
- GLADE_HOOKUP_OBJECT (main_wnd, toolitem6, "toolitem6");
- GLADE_HOOKUP_OBJECT (main_wnd, button4, "button4");
- GLADE_HOOKUP_OBJECT (main_wnd, alignment6, "alignment6");
- GLADE_HOOKUP_OBJECT (main_wnd, hbox6, "hbox6");
- GLADE_HOOKUP_OBJECT (main_wnd, image39, "image39");
- GLADE_HOOKUP_OBJECT (main_wnd, label6, "label6");
- GLADE_HOOKUP_OBJECT (main_wnd, toolitem7, "toolitem7");
- GLADE_HOOKUP_OBJECT (main_wnd, button5, "button5");
- GLADE_HOOKUP_OBJECT (main_wnd, alignment7, "alignment7");
- GLADE_HOOKUP_OBJECT (main_wnd, hbox7, "hbox7");
- GLADE_HOOKUP_OBJECT (main_wnd, image40, "image40");
- GLADE_HOOKUP_OBJECT (main_wnd, label7, "label7");
- GLADE_HOOKUP_OBJECT (main_wnd, toolitem8, "toolitem8");
- GLADE_HOOKUP_OBJECT (main_wnd, button6, "button6");
- GLADE_HOOKUP_OBJECT (main_wnd, alignment8, "alignment8");
- GLADE_HOOKUP_OBJECT (main_wnd, hbox8, "hbox8");
- GLADE_HOOKUP_OBJECT (main_wnd, image41, "image41");
- GLADE_HOOKUP_OBJECT (main_wnd, label8, "label8");
- GLADE_HOOKUP_OBJECT (main_wnd, toolitem9, "toolitem9");
- GLADE_HOOKUP_OBJECT (main_wnd, vseparator3, "vseparator3");
- GLADE_HOOKUP_OBJECT (main_wnd, toolitem10, "toolitem10");
- GLADE_HOOKUP_OBJECT (main_wnd, button7, "button7");
- GLADE_HOOKUP_OBJECT (main_wnd, alignment9, "alignment9");
- GLADE_HOOKUP_OBJECT (main_wnd, hbox9, "hbox9");
- GLADE_HOOKUP_OBJECT (main_wnd, image42, "image42");
- GLADE_HOOKUP_OBJECT (main_wnd, label9, "label9");
- GLADE_HOOKUP_OBJECT (main_wnd, toolitem11, "toolitem11");
- GLADE_HOOKUP_OBJECT (main_wnd, button8, "button8");
- GLADE_HOOKUP_OBJECT (main_wnd, alignment10, "alignment10");
- GLADE_HOOKUP_OBJECT (main_wnd, hbox10, "hbox10");
- GLADE_HOOKUP_OBJECT (main_wnd, image43, "image43");
- GLADE_HOOKUP_OBJECT (main_wnd, label10, "label10");
- GLADE_HOOKUP_OBJECT (main_wnd, hpaned1, "hpaned1");
- GLADE_HOOKUP_OBJECT (main_wnd, scrolledwindow1, "scrolledwindow1");
- GLADE_HOOKUP_OBJECT (main_wnd, treeview1, "treeview1");
- GLADE_HOOKUP_OBJECT (main_wnd, vpaned1, "vpaned1");
- GLADE_HOOKUP_OBJECT (main_wnd, scrolledwindow2, "scrolledwindow2");
- GLADE_HOOKUP_OBJECT (main_wnd, treeview2, "treeview2");
- GLADE_HOOKUP_OBJECT (main_wnd, scrolledwindow3, "scrolledwindow3");
- GLADE_HOOKUP_OBJECT (main_wnd, textview3, "textview3");
- GLADE_HOOKUP_OBJECT_NO_REF (main_wnd, tooltips, "tooltips");
-
- gtk_widget_grab_focus (treeview2);
- gtk_window_add_accel_group (GTK_WINDOW (main_wnd), accel_group);
-
- return main_wnd;
-}
Deleted: GNUnet/src/conf/gconf_interface.h
===================================================================
--- GNUnet/src/conf/gconf_interface.h 2006-05-14 09:10:31 UTC (rev 2807)
+++ GNUnet/src/conf/gconf_interface.h 2006-05-14 10:13:53 UTC (rev 2808)
@@ -1,5 +0,0 @@
-/*
- * DO NOT EDIT THIS FILE - it is generated by Glade.
- */
-
-GtkWidget *create_main_wnd (void);
Deleted: GNUnet/src/conf/gconf_support.c
===================================================================
--- GNUnet/src/conf/gconf_support.c 2006-05-14 09:10:31 UTC (rev 2807)
+++ GNUnet/src/conf/gconf_support.c 2006-05-14 10:13:53 UTC (rev 2808)
@@ -1,143 +0,0 @@
-/*
- * DO NOT EDIT THIS FILE - it is generated by Glade.
- */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdio.h>
-
-#include <gtk/gtk.h>
-
-#include "gconf_support.h"
-
-GtkWidget *
-lookup_widget (GtkWidget * widget, const gchar * widget_name)
-{
- GtkWidget *parent, *found_widget;
-
- for (;;)
- {
- if (GTK_IS_MENU (widget))
- parent = gtk_menu_get_attach_widget (GTK_MENU (widget));
- else
- parent = widget->parent;
- if (!parent)
- parent =
- (GtkWidget *) g_object_get_data (G_OBJECT (widget),
- "GladeParentKey");
- if (parent == NULL)
- break;
- widget = parent;
- }
-
- found_widget = (GtkWidget *) g_object_get_data (G_OBJECT (widget),
- widget_name);
- if (!found_widget)
- g_warning ("Widget not found: %s", widget_name);
- return found_widget;
-}
-
-static GList *pixmaps_directories = NULL;
-
-/* Use this function to set the directory containing installed pixmaps. */
-void
-add_pixmap_directory (const gchar * directory)
-{
- pixmaps_directories = g_list_prepend (pixmaps_directories,
- g_strdup (directory));
-}
-
-/* This is an internally used function to find pixmap files. */
-static gchar *
-find_pixmap_file (const gchar * filename)
-{
- GList *elem;
-
- /* We step through each of the pixmaps directory to find it. */
- elem = pixmaps_directories;
- while (elem)
- {
- gchar *pathname = g_strdup_printf ("%s%s%s", (gchar *) elem->data,
- G_DIR_SEPARATOR_S, filename);
- if (g_file_test (pathname, G_FILE_TEST_EXISTS))
- return pathname;
- g_free (pathname);
- elem = elem->next;
- }
- return NULL;
-}
-
-/* This is an internally used function to create pixmaps. */
-GtkWidget *
-create_pixmap (GtkWidget * widget, const gchar * filename)
-{
- gchar *pathname = NULL;
- GtkWidget *pixmap;
-
- if (!filename || !filename[0])
- return gtk_image_new ();
-
- pathname = find_pixmap_file (filename);
-
- if (!pathname)
- {
- g_warning (_("Couldn't find pixmap file: %s"), filename);
- return gtk_image_new ();
- }
-
- pixmap = gtk_image_new_from_file (pathname);
- g_free (pathname);
- return pixmap;
-}
-
-/* This is an internally used function to create pixmaps. */
-GdkPixbuf *
-create_pixbuf (const gchar * filename)
-{
- gchar *pathname = NULL;
- GdkPixbuf *pixbuf;
- GError *error = NULL;
-
- if (!filename || !filename[0])
- return NULL;
-
- pathname = find_pixmap_file (filename);
-
- if (!pathname)
- {
- g_warning (_("Couldn't find pixmap file: %s"), filename);
- return NULL;
- }
-
- pixbuf = gdk_pixbuf_new_from_file (pathname, &error);
- if (!pixbuf)
- {
- fprintf (stderr, "Failed to load pixbuf file: %s: %s\n",
- pathname, error->message);
- g_error_free (error);
- }
- g_free (pathname);
- return pixbuf;
-}
-
-/* This is used to set ATK action descriptions. */
-void
-glade_set_atk_action_description (AtkAction * action,
- const gchar * action_name,
- const gchar * description)
-{
- gint n_actions, i;
-
- n_actions = atk_action_get_n_actions (action);
- for (i = 0; i < n_actions; i++)
- {
- if (!strcmp (atk_action_get_name (action, i), action_name))
- atk_action_set_description (action, i, description);
- }
-}
Deleted: GNUnet/src/conf/gconf_support.h
===================================================================
--- GNUnet/src/conf/gconf_support.h 2006-05-14 09:10:31 UTC (rev 2807)
+++ GNUnet/src/conf/gconf_support.h 2006-05-14 10:13:53 UTC (rev 2808)
@@ -1,64 +0,0 @@
-/*
- * DO NOT EDIT THIS FILE - it is generated by Glade.
- */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <gtk/gtk.h>
-
-/*
- * Standard gettext macros.
- */
-#ifdef ENABLE_NLS
-# include <libintl.h>
-# undef _
-# define _(String) dgettext (PACKAGE, String)
-# ifdef gettext_noop
-# define N_(String) gettext_noop (String)
-# else
-# define N_(String) (String)
-# endif
-#else
-# define textdomain(String) (String)
-# define gettext(String) (String)
-# define dgettext(Domain,Message) (Message)
-# define dcgettext(Domain,Message,Type) (Message)
-# define bindtextdomain(Domain,Directory) (Domain)
-# define _(String) (String)
-# define N_(String) (String)
-#endif
-
-
-/*
- * Public Functions.
- */
-
-/*
- * This function returns a widget in a component created by Glade.
- * Call it with the toplevel widget in the component (i.e. a window/dialog),
- * or alternatively any widget in the component, and the name of the widget
- * you want returned.
- */
-GtkWidget *lookup_widget (GtkWidget * widget, const gchar * widget_name);
-
-
-/* Use this function to set the directory containing installed pixmaps. */
-void add_pixmap_directory (const gchar * directory);
-
-
-/*
- * Private Functions.
- */
-
-/* This is used to create the pixmaps used in the interface. */
-GtkWidget *create_pixmap (GtkWidget * widget, const gchar * filename);
-
-/* This is used to create the pixbufs used in the interface. */
-GdkPixbuf *create_pixbuf (const gchar * filename);
-
-/* This is used to set ATK action descriptions. */
-void glade_set_atk_action_description (AtkAction * action,
- const gchar * action_name,
- const gchar * description);
Added: GNUnet/src/conf/glade_support.c
===================================================================
--- GNUnet/src/conf/glade_support.c 2006-05-14 09:10:31 UTC (rev 2807)
+++ GNUnet/src/conf/glade_support.c 2006-05-14 10:13:53 UTC (rev 2808)
@@ -0,0 +1,137 @@
+/*
+ This file is part of GNUnet.
+ (C) 2006 Christian Grothoff (and other contributing authors)
+
+ GNUnet is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; either version 2, or (at your
+ option) any later version.
+
+ GNUnet is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with GNUnet; see the file COPYING. If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+*/
+
+#include "platform.h"
+#include "gnunet_util.h"
+#include "glade_support.h"
+
+/**
+ * Handle to the dynamic library (which contains this code)
+ */
+static void * library;
+
+/**
+ * Current glade handle.
+ */
+static GladeXML * mainXML_;
+
+GladeXML * getMainXML() {
+ return mainXML_;
+}
+
+void destroyMainXML() {
+ GNUNET_ASSERT(mainXML_ != NULL);
+ g_object_unref(mainXML_);
+ mainXML_ = NULL;
+}
+
+char * get_glade_filename() {
+ char * gladeFile;
+
+#ifdef MINGW
+ gladeFile = MALLOC(_MAX_PATH + 1);
+ plibc_conv_to_win_path(DATADIR"/wizard.glade",
+ gladeFile);
+#else
+ gladeFile = STRDUP(DATADIR"/wizard.glade");
+#endif
+ return gladeFile;
+}
+
+
+static void connector(const gchar *handler_name,
+ GObject *object,
+ const gchar *signal_name,
+ const gchar *signal_data,
+ GObject *connect_object,
+ gboolean after,
+ gpointer user_data) {
+ GladeXML * xml = user_data;
+ void * method;
+
+ GNUNET_ASSERT(xml != NULL);
+ method = trybindDynamicMethod(library,
+ "",
+ handler_name);
+ if (method == NULL) {
+ LOG(LOG_DEBUG,
+ _("Failed to find handler for `%s'\n"),
+ handler_name);
+ return;
+ }
+ glade_xml_signal_connect(xml,
+ handler_name,
+ (GCallback) method);
+}
+
+GladeXML * load_xml(const char * dialog_name) {
+ char * gladeFile;
+ GladeXML * ret;
+
+ gladeFile = get_glade_filename();
+ ret = glade_xml_new(gladeFile,
+ dialog_name,
+ PACKAGE_NAME);
+ if (ret == NULL)
+ errexit(_("Failed to open `%s'.\n"),
+ gladeFile);
+ FREE(gladeFile);
+ glade_xml_signal_autoconnect_full(ret, &connector, ret);
+ return ret;
+}
+
+GtkWidget * lookup_widget(const char * name) {
+ return glade_xml_get_widget(mainXML_, name);
+}
+
+GtkWidget * get_xml(const char * dialog_name) {
+ mainXML_ = load_xml(dialog_name);
+ return glade_xml_get_widget(mainXML_,
+ dialog_name);
+}
+
+/**
+ * Helper function to just show a simple dialog
+ * that requires no initialization.
+ */
+void showDialog(const char * name) {
+ GtkWidget * msgSave;
+ char * gladeFile;
+ GladeXML * myXML;
+
+ gladeFile = get_glade_filename();
+ myXML = glade_xml_new(gladeFile,
+ name,
+ PACKAGE_NAME);
+ if (mainXML_ == NULL)
+ errexit(_("Failed to open `%s'.\n"),
+ gladeFile);
+ FREE(gladeFile);
+ glade_xml_signal_autoconnect_full(myXML, &connector, myXML);
+ msgSave = glade_xml_get_widget(myXML,
+ name);
+ gtk_widget_show(msgSave);
+ g_object_unref(myXML);
+}
+
+void setLibrary(void * lib) {
+ library = lib;
+}
+
Added: GNUnet/src/conf/glade_support.h
===================================================================
--- GNUnet/src/conf/glade_support.h 2006-05-14 09:10:31 UTC (rev 2807)
+++ GNUnet/src/conf/glade_support.h 2006-05-14 10:13:53 UTC (rev 2808)
@@ -0,0 +1,48 @@
+/*
+ This file is part of GNUnet.
+ (C) 2006 Christian Grothoff (and other contributing authors)
+
+ GNUnet is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; either version 2, or (at your
+ option) any later version.
+
+ GNUnet is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with GNUnet; see the file COPYING. If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+*/
+#ifndef GLADE_SUPPORT_H
+#define GLADE_SUPPORT_H
+
+
+#include <gtk/gtk.h>
+#include <gtk/gtktext.h>
+#include <glade/glade.h>
+
+#define mainXML getMainXML()
+
+GladeXML * getMainXML(void);
+
+void destroyMainXML(void);
+
+void setLibrary(void * lib);
+
+GtkWidget * get_xml(const char * dialog_name);
+
+GladeXML * load_xml(const char * dialog_name);
+
+/**
+ * Helper function to just show a simple dialog
+ * that requires no initialization.
+ */
+void showDialog(const char * name);
+
+GtkWidget * lookup_widget(const char * name);
+
+#endif
Modified: GNUnet/src/conf/wizard.glade
===================================================================
--- GNUnet/src/conf/wizard.glade 2006-05-14 09:10:31 UTC (rev 2807)
+++ GNUnet/src/conf/wizard.glade 2006-05-14 10:13:53 UTC (rev 2808)
@@ -2808,4 +2808,1058 @@
</child>
</widget>
+<widget class="GtkWindow" id="setupWindow">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Gtk GNUnet Configurator</property>
+ <property name="type">GTK_WINDOW_TOPLEVEL</property>
+ <property name="window_position">GTK_WIN_POS_NONE</property>
+ <property name="modal">False</property>
+ <property name="default_width">640</property>
+ <property name="default_height">480</property>
+ <property name="resizable">True</property>
+ <property name="destroy_with_parent">False</property>
+ <property name="decorated">True</property>
+ <property name="skip_taskbar_hint">False</property>
+ <property name="skip_pager_hint">False</property>
+ <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+ <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ <property name="focus_on_map">True</property>
+ <property name="urgency_hint">False</property>
+ <signal name="destroy" handler="on_window1_destroy" object="main_wnd"/>
+ <signal name="size_request" handler="on_window1_size_request"
object="vpaned1" last_modification_time="Fri, 11 Jan 2002 16:17:11 GMT"/>
+ <signal name="delete_event" handler="on_window1_delete_event"
object="main_wnd" last_modification_time="Sun, 09 Mar 2003 19:42:46 GMT"/>
+
+ <child>
+ <widget class="GtkVBox" id="vbox1">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <placeholder/>
+ </child>
+
+ <child>
+ <widget class="GtkHandleBox" id="handlebox1">
+ <property name="visible">True</property>
+ <property name="shadow_type">GTK_SHADOW_OUT</property>
+ <property name="handle_position">GTK_POS_LEFT</property>
+ <property name="snap_edge">GTK_POS_TOP</property>
+
+ <child>
+ <widget class="GtkToolbar" id="toolbar1">
+ <property name="visible">True</property>
+ <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
+ <property name="toolbar_style">GTK_TOOLBAR_BOTH</property>
+ <property name="tooltips">True</property>
+ <property name="show_arrow">True</property>
+
+ <child>
+ <widget class="GtkToolItem" id="toolitem1">
+ <property name="visible">True</property>
+ <property name="visible_horizontal">True</property>
+ <property name="visible_vertical">True</property>
+ <property name="is_important">False</property>
+
+ <child>
+ <widget class="GtkButton" id="button1">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Goes up of
one level (single view)</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <signal name="pressed" handler="on_back_pressed"/>
+
+ <child>
+ <widget class="GtkAlignment" id="alignment11">
+ <property name="visible">True</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <property name="top_padding">0</property>
+ <property name="bottom_padding">0</property>
+ <property name="left_padding">0</property>
+ <property name="right_padding">0</property>
+
+ <child>
+ <widget class="GtkHBox" id="hbox11">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">2</property>
+
+ <child>
+ <widget class="GtkImage" id="image44">
+ <property name="visible">True</property>
+ <property name="stock">gtk-go-up</property>
+ <property name="icon_size">4</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label11">
+ <property name="visible">True</property>
+ <property name="label"
translatable="yes">Up</property>
+ <property name="use_underline">True</property>
+ <property name="use_markup">False</property>
+ <property
name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property
name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkToolItem" id="toolitem2">
+ <property name="visible">True</property>
+ <property name="visible_horizontal">True</property>
+ <property name="visible_vertical">True</property>
+ <property name="is_important">False</property>
+
+ <child>
+ <widget class="GtkVSeparator" id="vseparator1">
+ <property name="visible">True</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkToolItem" id="toolitem3">
+ <property name="visible">True</property>
+ <property name="visible_horizontal">True</property>
+ <property name="visible_vertical">True</property>
+ <property name="is_important">False</property>
+
+ <child>
+ <widget class="GtkButton" id="button2">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Load a config
file</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <signal name="pressed" handler="on_load_pressed"/>
+
+ <child>
+ <widget class="GtkAlignment" id="alignment2">
+ <property name="visible">True</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <property name="top_padding">0</property>
+ <property name="bottom_padding">0</property>
+ <property name="left_padding">0</property>
+ <property name="right_padding">0</property>
+
+ <child>
+ <widget class="GtkHBox" id="hbox2">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">2</property>
+
+ <child>
+ <widget class="GtkImage" id="image35">
+ <property name="visible">True</property>
+ <property name="stock">gtk-open</property>
+ <property name="icon_size">4</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="label"
translatable="yes">Load</property>
+ <property name="use_underline">True</property>
+ <property name="use_markup">False</property>
+ <property
name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property
name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkToolItem" id="toolitem4">
+ <property name="visible">True</property>
+ <property name="visible_horizontal">True</property>
+ <property name="visible_vertical">True</property>
+ <property name="is_important">False</property>
+
+ <child>
+ <widget class="GtkButton" id="button3">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Save a config
file</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <signal name="pressed" handler="on_save_pressed"/>
+
+ <child>
+ <widget class="GtkAlignment" id="alignment4">
+ <property name="visible">True</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <property name="top_padding">0</property>
+ <property name="bottom_padding">0</property>
+ <property name="left_padding">0</property>
+ <property name="right_padding">0</property>
+
+ <child>
+ <widget class="GtkHBox" id="hbox4">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">2</property>
+
+ <child>
+ <widget class="GtkImage" id="image37">
+ <property name="visible">True</property>
+ <property name="stock">gtk-save</property>
+ <property name="icon_size">4</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="label"
translatable="yes">Save</property>
+ <property name="use_underline">True</property>
+ <property name="use_markup">False</property>
+ <property
name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property
name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkToolItem" id="toolitem5">
+ <property name="visible">True</property>
+ <property name="visible_horizontal">True</property>
+ <property name="visible_vertical">True</property>
+ <property name="is_important">False</property>
+
+ <child>
+ <widget class="GtkVSeparator" id="vseparator2">
+ <property name="visible">True</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkToolItem" id="toolitem6">
+ <property name="visible">True</property>
+ <property name="visible_horizontal">True</property>
+ <property name="visible_vertical">True</property>
+ <property name="is_important">False</property>
+
+ <child>
+ <widget class="GtkButton" id="button4">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Single
view</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <signal name="clicked" handler="on_single_clicked"
last_modification_time="Sun, 12 Jan 2003 14:28:39 GMT"/>
+
+ <child>
+ <widget class="GtkAlignment" id="alignment6">
+ <property name="visible">True</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <property name="top_padding">0</property>
+ <property name="bottom_padding">0</property>
+ <property name="left_padding">0</property>
+ <property name="right_padding">0</property>
+
+ <child>
+ <widget class="GtkHBox" id="hbox6">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">2</property>
+
+ <child>
+ <widget class="GtkImage" id="image39">
+ <property name="visible">True</property>
+ <property
name="stock">gtk-justify-fill</property>
+ <property name="icon_size">4</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label6">
+ <property name="visible">True</property>
+ <property name="label"
translatable="yes">Single</property>
+ <property name="use_underline">True</property>
+ <property name="use_markup">False</property>
+ <property
name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property
name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkToolItem" id="toolitem7">
+ <property name="visible">True</property>
+ <property name="visible_horizontal">True</property>
+ <property name="visible_vertical">True</property>
+ <property name="is_important">False</property>
+
+ <child>
+ <widget class="GtkButton" id="button5">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Split
view</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <signal name="clicked" handler="on_split_clicked"
last_modification_time="Sun, 12 Jan 2003 14:28:45 GMT"/>
+
+ <child>
+ <widget class="GtkAlignment" id="alignment7">
+ <property name="visible">True</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <property name="top_padding">0</property>
+ <property name="bottom_padding">0</property>
+ <property name="left_padding">0</property>
+ <property name="right_padding">0</property>
+
+ <child>
+ <widget class="GtkHBox" id="hbox7">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">2</property>
+
+ <child>
+ <widget class="GtkImage" id="image40">
+ <property name="visible">True</property>
+ <property
name="stock">gtk-justify-fill</property>
+ <property name="icon_size">4</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label7">
+ <property name="visible">True</property>
+ <property name="label"
translatable="yes">Split</property>
+ <property name="use_underline">True</property>
+ <property name="use_markup">False</property>
+ <property
name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property
name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkToolItem" id="toolitem8">
+ <property name="visible">True</property>
+ <property name="visible_horizontal">True</property>
+ <property name="visible_vertical">True</property>
+ <property name="is_important">False</property>
+
+ <child>
+ <widget class="GtkButton" id="button6">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Full
view</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <signal name="clicked" handler="on_full_clicked"
last_modification_time="Sun, 12 Jan 2003 14:28:50 GMT"/>
+
+ <child>
+ <widget class="GtkAlignment" id="alignment8">
+ <property name="visible">True</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <property name="top_padding">0</property>
+ <property name="bottom_padding">0</property>
+ <property name="left_padding">0</property>
+ <property name="right_padding">0</property>
+
+ <child>
+ <widget class="GtkHBox" id="hbox8">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">2</property>
+
+ <child>
+ <widget class="GtkImage" id="image41">
+ <property name="visible">True</property>
+ <property
name="stock">gtk-justify-fill</property>
+ <property name="icon_size">4</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label8">
+ <property name="visible">True</property>
+ <property name="label"
translatable="yes">Full</property>
+ <property name="use_underline">True</property>
+ <property name="use_markup">False</property>
+ <property
name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property
name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkToolItem" id="toolitem9">
+ <property name="visible">True</property>
+ <property name="visible_horizontal">True</property>
+ <property name="visible_vertical">True</property>
+ <property name="is_important">False</property>
+
+ <child>
+ <widget class="GtkVSeparator" id="vseparator3">
+ <property name="visible">True</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkToolItem" id="toolitem10">
+ <property name="visible">True</property>
+ <property name="visible_horizontal">True</property>
+ <property name="visible_vertical">True</property>
+ <property name="is_important">False</property>
+
+ <child>
+ <widget class="GtkButton" id="button7">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Collapse the
whole tree in the right frame</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <signal name="pressed" handler="on_collapse_pressed"/>
+
+ <child>
+ <widget class="GtkAlignment" id="alignment9">
+ <property name="visible">True</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <property name="top_padding">0</property>
+ <property name="bottom_padding">0</property>
+ <property name="left_padding">0</property>
+ <property name="right_padding">0</property>
+
+ <child>
+ <widget class="GtkHBox" id="hbox9">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">2</property>
+
+ <child>
+ <widget class="GtkImage" id="image42">
+ <property name="visible">True</property>
+ <property name="stock">gtk-remove</property>
+ <property name="icon_size">4</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label9">
+ <property name="visible">True</property>
+ <property name="label"
translatable="yes">Collapse</property>
+ <property name="use_underline">True</property>
+ <property name="use_markup">False</property>
+ <property
name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property
name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkToolItem" id="toolitem11">
+ <property name="visible">True</property>
+ <property name="visible_horizontal">True</property>
+ <property name="visible_vertical">True</property>
+ <property name="is_important">False</property>
+
+ <child>
+ <widget class="GtkButton" id="button8">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Expand the
whole tree in the right frame</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <signal name="pressed" handler="on_expand_pressed"/>
+
+ <child>
+ <widget class="GtkAlignment" id="alignment10">
+ <property name="visible">True</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <property name="top_padding">0</property>
+ <property name="bottom_padding">0</property>
+ <property name="left_padding">0</property>
+ <property name="right_padding">0</property>
+
+ <child>
+ <widget class="GtkHBox" id="hbox10">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">2</property>
+
+ <child>
+ <widget class="GtkImage" id="image43">
+ <property name="visible">True</property>
+ <property name="stock">gtk-add</property>
+ <property name="icon_size">4</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label10">
+ <property name="visible">True</property>
+ <property name="label"
translatable="yes">Expand</property>
+ <property name="use_underline">True</property>
+ <property name="use_markup">False</property>
+ <property
name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property
name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">False</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkHPaned" id="hpaned1">
+ <property name="width_request">1</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="position">0</property>
+
+ <child>
+ <widget class="GtkScrolledWindow" id="scrolledwindow1">
+ <property name="visible">True</property>
+ <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
+ <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
+ <property name="shadow_type">GTK_SHADOW_IN</property>
+ <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+ <child>
+ <widget class="GtkTreeView" id="treeview1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="headers_visible">True</property>
+ <property name="rules_hint">False</property>
+ <property name="reorderable">False</property>
+ <property name="enable_search">True</property>
+ <property name="fixed_height_mode">False</property>
+ <property name="hover_selection">False</property>
+ <property name="hover_expand">False</property>
+ <signal name="cursor_changed"
handler="on_treeview2_cursor_changed" last_modification_time="Sun, 12 Jan 2003
15:58:22 GMT"/>
+ <signal name="button_press_event"
handler="on_treeview1_button_press_event" last_modification_time="Sun, 12 Jan
2003 16:03:52 GMT"/>
+ <signal name="key_press_event"
handler="on_treeview2_key_press_event" last_modification_time="Sun, 12 Jan 2003
16:11:44 GMT"/>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="shrink">True</property>
+ <property name="resize">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkVPaned" id="vpaned1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="position">0</property>
+
+ <child>
+ <widget class="GtkScrolledWindow" id="scrolledwindow2">
+ <property name="visible">True</property>
+ <property
name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
+ <property
name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
+ <property name="shadow_type">GTK_SHADOW_IN</property>
+ <property
name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+ <child>
+ <widget class="GtkTreeView" id="treeview2">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="has_focus">True</property>
+ <property name="headers_visible">True</property>
+ <property name="rules_hint">False</property>
+ <property name="reorderable">False</property>
+ <property name="enable_search">True</property>
+ <property name="fixed_height_mode">False</property>
+ <property name="hover_selection">False</property>
+ <property name="hover_expand">False</property>
+ <signal name="cursor_changed"
handler="on_treeview2_cursor_changed" last_modification_time="Sun, 12 Jan 2003
15:57:55 GMT"/>
+ <signal name="button_press_event"
handler="on_treeview2_button_press_event" last_modification_time="Sun, 12 Jan
2003 15:57:58 GMT"/>
+ <signal name="key_press_event"
handler="on_treeview2_key_press_event" last_modification_time="Sun, 12 Jan 2003
15:58:01 GMT"/>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="shrink">True</property>
+ <property name="resize">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkScrolledWindow" id="scrolledwindow3">
+ <property name="visible">True</property>
+ <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+ <property
name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
+ <property name="shadow_type">GTK_SHADOW_IN</property>
+ <property
name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+ <child>
+ <widget class="GtkTextView" id="textview3">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="editable">False</property>
+ <property name="overwrite">False</property>
+ <property name="accepts_tab">True</property>
+ <property name="justification">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap_mode">GTK_WRAP_WORD</property>
+ <property name="cursor_visible">True</property>
+ <property name="pixels_above_lines">2</property>
+ <property name="pixels_below_lines">2</property>
+ <property name="pixels_inside_wrap">0</property>
+ <property name="left_margin">2</property>
+ <property name="right_margin">2</property>
+ <property name="indent">0</property>
+ <property name="text" translatable="yes">This is GNUnet's
configuration interface.
+
+GNUnet's options are separated into categories. You can browse them in the
left tree. If you click on one of the categories, its options are shown above.
+
+To change the value of an option, simply click on its value and enter a new
value. To get additional information about a specific option, click on its
description.</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="shrink">True</property>
+ <property name="resize">True</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="shrink">True</property>
+ <property name="resize">True</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+</widget>
+
+<widget class="GtkDialog" id="introductionDialog">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Introduction</property>
+ <property name="type">GTK_WINDOW_TOPLEVEL</property>
+ <property name="window_position">GTK_WIN_POS_CENTER</property>
+ <property name="modal">True</property>
+ <property name="default_width">400</property>
+ <property name="default_height">300</property>
+ <property name="resizable">True</property>
+ <property name="destroy_with_parent">True</property>
+ <property name="icon_name">gtk-help</property>
+ <property name="decorated">True</property>
+ <property name="skip_taskbar_hint">False</property>
+ <property name="skip_pager_hint">False</property>
+ <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+ <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ <property name="focus_on_map">True</property>
+ <property name="urgency_hint">False</property>
+ <property name="has_separator">True</property>
+
+ <child internal-child="vbox">
+ <widget class="GtkVBox" id="dialog-vbox1">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child internal-child="action_area">
+ <widget class="GtkHButtonBox" id="dialog-action_area1">
+ <property name="visible">True</property>
+ <property name="layout_style">GTK_BUTTONBOX_END</property>
+
+ <child>
+ <widget class="GtkButton" id="okbutton1">
+ <property name="visible">True</property>
+ <property name="can_default">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-ok</property>
+ <property name="use_stock">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <property name="response_id">-7</property>
+ <signal name="clicked" handler="gtk_widget_destroy"
object="introductionDialog" last_modification_time="Sun, 14 May 2006 10:42:20
GMT"/>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">GTK_PACK_END</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkScrolledWindow" id="scrolledwindow9">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="shadow_type">GTK_SHADOW_IN</property>
+ <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+ <child>
+ <widget class="GtkTextView" id="introductionText">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="editable">False</property>
+ <property name="overwrite">False</property>
+ <property name="accepts_tab">False</property>
+ <property name="justification">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap_mode">GTK_WRAP_WORD</property>
+ <property name="cursor_visible">False</property>
+ <property name="pixels_above_lines">0</property>
+ <property name="pixels_below_lines">0</property>
+ <property name="pixels_inside_wrap">0</property>
+ <property name="left_margin">0</property>
+ <property name="right_margin">0</property>
+ <property name="indent">0</property>
+ <property name="text" translatable="yes">Welcome to GNUnet Setup.
+
+For each option, a blank box indicates the feature is disabled, and checked
one indicates it is enabled.
+If you do not see an option that you believe should be present, try turning on
Show All Options under the Options menu.
+
+Although there is no cross reference yet to help you figure out what other
options must be enabled to support the option you are interested in, you can
still view the help of a grayed-out option.
+
+Toggling Show Debug Info under the Options menu will show the dependencies,
which you can then match by examining other options.</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+</widget>
+
+<widget class="GtkAboutDialog" id="aboutdialog">
+ <property name="visible">True</property>
+ <property name="destroy_with_parent">False</property>
+ <property name="name" translatable="yes">gnunet-setup</property>
+ <property name="copyright" translatable="yes">(C) 2001-2006 Christian
Grothoff (and other contributing authors)</property>
+ <property name="comments" translatable="yes">This is the configuration tool
for GNUnet.</property>
+ <property name="license" translatable="yes"></property>
+ <property name="wrap_license">True</property>
+ <property name="website">http://gnunet.org/</property>
+ <property name="website_label"
translatable="yes">http://gnunet.org/</property>
+ <property name="authors"></property>
+ <property name="documenters"></property>
+ <property name="artists"></property>
+ <property name="translator_credits" translatable="yes"
comments="TRANSLATORS: Replace this string with your names, one name per
line.">translator-credits</property>
+ <property name="logo">gnunet-logo-color.png</property>
+</widget>
+
</glade-interface>
Modified: GNUnet/src/conf/wizard_gtk.c
===================================================================
--- GNUnet/src/conf/wizard_gtk.c 2006-05-14 09:10:31 UTC (rev 2807)
+++ GNUnet/src/conf/wizard_gtk.c 2006-05-14 10:13:53 UTC (rev 2808)
@@ -27,9 +27,7 @@
#include "gnunet_util.h"
#include "platform.h"
-#include <gtk/gtk.h>
-#include <gtk/gtktext.h>
-#include <glade/glade.h>
+#include "glade_support.h"
#ifndef MINGW
#include <grp.h>
@@ -44,20 +42,10 @@
#include "confdata.h"
/**
- * Handle to the dynamic library (which contains this code)
- */
-static void * library;
-
-/**
* Current open window.
*/
-static GtkWidget *curwnd;
+static GtkWidget * curwnd;
-/**
- * Current glade handle.
- */
-static GladeXML * mainXML;
-
static int doOpenEnhConfigurator = 0;
static int doAutoStart = 0;
@@ -82,8 +70,7 @@
quit = 0;
gtk_widget_destroy(curwnd);
curwnd = NULL;
- g_object_unref(mainXML);
- mainXML = NULL;
+ destroyMainXML();
quit = 1;
}
@@ -94,83 +81,7 @@
gtk_main_quit();
}
-static char * get_glade_filename() {
- char * gladeFile;
-#ifdef MINGW
- gladeFile = MALLOC(_MAX_PATH + 1);
- plibc_conv_to_win_path(DATADIR"/wizard.glade",
- gladeFile);
-#else
- gladeFile = STRDUP(DATADIR"/wizard.glade");
-#endif
- return gladeFile;
-}
-
-static void connector(const gchar *handler_name,
- GObject *object,
- const gchar *signal_name,
- const gchar *signal_data,
- GObject *connect_object,
- gboolean after,
- gpointer user_data) {
- GladeXML * xml = user_data;
- void * method;
-
- method = trybindDynamicMethod(library,
- "",
- handler_name);
- if (method == NULL) {
- LOG(LOG_DEBUG,
- _("Failed to find handler for `%s'\n"),
- handler_name);
- return;
- }
- glade_xml_signal_connect(xml,
- handler_name,
- (GCallback) method);
-}
-
-static GtkWidget * get_xml(const char * dialog_name) {
- char * gladeFile;
-
- gladeFile = get_glade_filename();
- mainXML = glade_xml_new(gladeFile,
- dialog_name,
- PACKAGE_NAME);
- if (mainXML == NULL)
- errexit(_("Failed to open `%s'.\n"),
- gladeFile);
- FREE(gladeFile);
- glade_xml_signal_autoconnect_full(mainXML, &connector, mainXML);
- return glade_xml_get_widget(mainXML,
- dialog_name);
-}
-
-/**
- * Helper function to just show a simple dialog
- * that requires no initialization.
- */
-static void showDialog(const char * name) {
- GtkWidget * msgSave;
- char * gladeFile;
- GladeXML * myXML;
-
- gladeFile = get_glade_filename();
- myXML = glade_xml_new(gladeFile,
- name,
- PACKAGE_NAME);
- if (mainXML == NULL)
- errexit(_("Failed to open `%s'.\n"),
- gladeFile);
- FREE(gladeFile);
- glade_xml_signal_autoconnect_full(myXML, &connector, myXML);
- msgSave = glade_xml_get_widget(myXML,
- name);
- gtk_widget_show(msgSave);
- g_object_unref(myXML);
-}
-
struct insert_nic_cls {
GtkWidget * cmbNIC;
int nic_item_count;
@@ -239,7 +150,7 @@
destroyCurrentWindow();
curwnd = get_xml("assi_step2");
- cls.cmbNIC = glade_xml_get_widget(mainXML, "cmbNIC");
+ cls.cmbNIC = lookup_widget("cmbNIC");
GNUNET_ASSERT(cls.cmbNIC != NULL);
cls.nic_item_count = 0;
model = gtk_list_store_new(1, G_TYPE_STRING);
@@ -271,7 +182,7 @@
gtk_widget_set_usize(cls.cmbNIC, 10, -1);
}
- entIP = glade_xml_get_widget(mainXML, "entIP");
+ entIP = lookup_widget("entIP");
sym = sym_find("IP", "NETWORK");
if (sym != NULL) {
sym_calc_value_ext(sym, 1);
@@ -281,7 +192,7 @@
gtk_entry_set_text(GTK_ENTRY(entIP), val);
}
- chkFW = glade_xml_get_widget(mainXML, "chkFW");
+ chkFW = lookup_widget("chkFW");
sym = sym_find("LIMITED", "NAT");
if (sym != NULL) {
sym_calc_value_ext(sym, 1);
@@ -303,11 +214,11 @@
destroyCurrentWindow();
curwnd = get_xml("assi_step3");
- entUp = glade_xml_get_widget(mainXML, "entUp");
- entDown = glade_xml_get_widget(mainXML, "entDown");
- radGNUnet = glade_xml_get_widget(mainXML, "radGNUnet");
- radShare = glade_xml_get_widget(mainXML, "radShare");
- entCPU = glade_xml_get_widget(mainXML, "entCPU");
+ entUp = lookup_widget("entUp");
+ entDown = lookup_widget("entDown");
+ radGNUnet = lookup_widget("radGNUnet");
+ radShare = lookup_widget("radShare");
+ entCPU = lookup_widget("entCPU");
sym = sym_find("MAXNETUPBPSTOTAL", "LOAD");
if (sym) {
@@ -354,8 +265,8 @@
destroyCurrentWindow();
curwnd = get_xml("assi_step4");
- entUser = glade_xml_get_widget(mainXML, "entUser");
- entGroup = glade_xml_get_widget(mainXML, "entGroup");
+ entUser = lookup_widget("entUser");
+ entGroup = lookup_widget("entGroup");
if (NULL != user_name) {
sym = sym_find("USER", "GNUNETD");
@@ -442,10 +353,10 @@
destroyCurrentWindow();
curwnd = get_xml("assi_step5");
- entQuota = glade_xml_get_widget(mainXML, "entQuota");
- chkMigr = glade_xml_get_widget(mainXML, "chkMigr");
- chkStart = glade_xml_get_widget(mainXML, "chkStart");
- chkEnh = glade_xml_get_widget(mainXML, "chkEnh");
+ entQuota = lookup_widget("entQuota");
+ chkMigr = lookup_widget("chkMigr");
+ chkStart = lookup_widget("chkStart");
+ chkEnh = lookup_widget("chkEnh");
sym = sym_find("QUOTA", "FS");
if (sym) {
@@ -489,18 +400,9 @@
GtkWidget * label98;
GtkWidget * msgSaveFailed;
char * err;
- char * gladeFile;
GladeXML * myXML;
- gladeFile = get_glade_filename();
- myXML = glade_xml_new(gladeFile,
- "msgSaveFailed",
- PACKAGE_NAME);
- if (mainXML == NULL)
- errexit(_("Failed to open `%s'.\n"),
- gladeFile);
- FREE(gladeFile);
- glade_xml_signal_autoconnect(myXML);
+ myXML = load_xml("msgSaveFailed");
msgSaveFailed = glade_xml_get_widget(myXML,
"msgSaveFailed");
label98 = glade_xml_get_widget(myXML, "label98");
@@ -746,7 +648,7 @@
struct symbol * sym;
char * filename;
- library = lib;
+ setLibrary(lib);
gtk_init(&argc, &argv);
#ifdef ENABLE_NLS
/* GTK uses UTF-8 encoding */
@@ -771,13 +673,11 @@
gdk_threads_enter();
gtk_main();
gdk_threads_leave();
- GNUNET_ASSERT(mainXML != NULL);
- g_object_unref(mainXML);
- mainXML = NULL;
+ destroyMainXML();
+ setLibrary(NULL);
if (doOpenEnhConfigurator)
- gconf_main(argc, argv);
+ gconf_main(argc, argv, lib);
FREENONNULL(user_name);
FREENONNULL(group_name);
- library = NULL;
return 0;
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r2808 - GNUnet/src/conf,
grothoff <=