aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/common/logging.c2
-rw-r--r--src/core/eggtrayicon.c2
-rw-r--r--src/plugins/about/about.c2
-rw-r--r--src/plugins/fs/collection.c2
-rw-r--r--src/plugins/fs/directory.c2
-rw-r--r--src/plugins/fs/namespace.c6
-rw-r--r--src/plugins/fs/namespace_create.c2
-rw-r--r--src/plugins/fs/search.c6
-rw-r--r--src/plugins/fs/upload.c4
9 files changed, 14 insertions, 14 deletions
diff --git a/src/common/logging.c b/src/common/logging.c
index 41cfdc2a..645f94dd 100644
--- a/src/common/logging.c
+++ b/src/common/logging.c
@@ -46,7 +46,7 @@ init ()
46 statusXML 46 statusXML
47 = 47 =
48 glade_xml_new (GNUNET_GTK_get_glade_filename (), "statusWindow", 48 glade_xml_new (GNUNET_GTK_get_glade_filename (), "statusWindow",
49 PACKAGNUNET_GE_NAME); 49 PACKAGE_NAME);
50 infoWindow = glade_xml_get_widget (statusXML, "statusWindow"); 50 infoWindow = glade_xml_get_widget (statusXML, "statusWindow");
51 infoWindowTextView 51 infoWindowTextView
52 = glade_xml_get_widget (statusXML, "messageWindowTextView"); 52 = glade_xml_get_widget (statusXML, "messageWindowTextView");
diff --git a/src/core/eggtrayicon.c b/src/core/eggtrayicon.c
index 932aab98..71ccdaa8 100644
--- a/src/core/eggtrayicon.c
+++ b/src/core/eggtrayicon.c
@@ -648,7 +648,7 @@ initTrayIcon ()
648 648
649 trayContextMenuXML = 649 trayContextMenuXML =
650 glade_xml_new (GNUNET_GTK_get_glade_filename (), "trayContextMenu", 650 glade_xml_new (GNUNET_GTK_get_glade_filename (), "trayContextMenu",
651 PACKAGNUNET_GE_NAME); 651 PACKAGE_NAME);
652 trayContextMenu = 652 trayContextMenu =
653 glade_xml_get_widget (trayContextMenuXML, "trayContextMenu"); 653 glade_xml_get_widget (trayContextMenuXML, "trayContextMenu");
654 tray_quit = glade_xml_get_widget (trayContextMenuXML, "tray_quit"); 654 tray_quit = glade_xml_get_widget (trayContextMenuXML, "tray_quit");
diff --git a/src/plugins/about/about.c b/src/plugins/about/about.c
index fe836bc9..c5fcd12d 100644
--- a/src/plugins/about/about.c
+++ b/src/plugins/about/about.c
@@ -40,7 +40,7 @@ on_about_clicked_about (GtkWidget * dummy, gpointer data)
40 40
41 axml = 41 axml =
42 glade_xml_new (GNUNET_GTK_get_glade_filename (), "aboutDialog", 42 glade_xml_new (GNUNET_GTK_get_glade_filename (), "aboutDialog",
43 PACKAGNUNET_GE_NAME); 43 PACKAGE_NAME);
44 ad = glade_xml_get_widget (axml, "aboutDialog"); 44 ad = glade_xml_get_widget (axml, "aboutDialog");
45 gtk_dialog_run (GTK_DIALOG (ad)); 45 gtk_dialog_run (GTK_DIALOG (ad));
46 gtk_widget_destroy (ad); 46 gtk_widget_destroy (ad);
diff --git a/src/plugins/fs/collection.c b/src/plugins/fs/collection.c
index d12a9218..31ec4dc2 100644
--- a/src/plugins/fs/collection.c
+++ b/src/plugins/fs/collection.c
@@ -61,7 +61,7 @@ createCollection_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
61 61
62 metaXML 62 metaXML
63 = glade_xml_new (GNUNET_GTK_get_glade_filename (), 63 = glade_xml_new (GNUNET_GTK_get_glade_filename (),
64 "createCollectionDialog", PACKAGNUNET_GE_NAME); 64 "createCollectionDialog", PACKAGE_NAME);
65 GNUNET_GTK_connect_glade_with_plugins (metaXML); 65 GNUNET_GTK_connect_glade_with_plugins (metaXML);
66 dialog = glade_xml_get_widget (metaXML, "createCollectionDialog"); 66 dialog = glade_xml_get_widget (metaXML, "createCollectionDialog");
67 createMetaDataListTreeView (metaXML, 67 createMetaDataListTreeView (metaXML,
diff --git a/src/plugins/fs/directory.c b/src/plugins/fs/directory.c
index 8416fcdf..a0f659fc 100644
--- a/src/plugins/fs/directory.c
+++ b/src/plugins/fs/directory.c
@@ -45,7 +45,7 @@ selectFile ()
45 45
46 uploadXML 46 uploadXML
47 = glade_xml_new (GNUNET_GTK_get_glade_filename (), 47 = glade_xml_new (GNUNET_GTK_get_glade_filename (),
48 "openDirectoryFileDialog", PACKAGNUNET_GE_NAME); 48 "openDirectoryFileDialog", PACKAGE_NAME);
49 GNUNET_GTK_connect_glade_with_plugins (uploadXML); 49 GNUNET_GTK_connect_glade_with_plugins (uploadXML);
50 dialog = GTK_FILE_CHOOSER (glade_xml_get_widget (uploadXML, 50 dialog = GTK_FILE_CHOOSER (glade_xml_get_widget (uploadXML,
51 "openDirectoryFileDialog")); 51 "openDirectoryFileDialog"));
diff --git a/src/plugins/fs/namespace.c b/src/plugins/fs/namespace.c
index e41cf46c..e285039e 100644
--- a/src/plugins/fs/namespace.c
+++ b/src/plugins/fs/namespace.c
@@ -117,7 +117,7 @@ makeNamespaceFrame (NamespaceList * entry)
117 GNUNET_GTK_DEBUG_BEGIN (); 117 GNUNET_GTK_DEBUG_BEGIN ();
118 namespaceXML 118 namespaceXML
119 = glade_xml_new (GNUNET_GTK_get_glade_filename (), 119 = glade_xml_new (GNUNET_GTK_get_glade_filename (),
120 "namespaceContentFrame", PACKAGNUNET_GE_NAME); 120 "namespaceContentFrame", PACKAGE_NAME);
121 GNUNET_GTK_connect_glade_with_plugins (namespaceXML); 121 GNUNET_GTK_connect_glade_with_plugins (namespaceXML);
122 child = extractMainWidgetFromWindow (namespaceXML, "namespaceContentFrame"); 122 child = extractMainWidgetFromWindow (namespaceXML, "namespaceContentFrame");
123 resultList = glade_xml_get_widget (namespaceXML, 123 resultList = glade_xml_get_widget (namespaceXML,
@@ -691,7 +691,7 @@ on_namespaceInsertButton_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
691 691
692 metaXML 692 metaXML
693 = glade_xml_new (GNUNET_GTK_get_glade_filename (), 693 = glade_xml_new (GNUNET_GTK_get_glade_filename (),
694 "namespaceInsertDialog", PACKAGNUNET_GE_NAME); 694 "namespaceInsertDialog", PACKAGE_NAME);
695 GNUNET_GTK_connect_glade_with_plugins (metaXML); 695 GNUNET_GTK_connect_glade_with_plugins (metaXML);
696 dialog = glade_xml_get_widget (metaXML, "namespaceInsertDialog"); 696 dialog = glade_xml_get_widget (metaXML, "namespaceInsertDialog");
697 gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); 697 gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
@@ -823,7 +823,7 @@ on_namespaceUpdateButton_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
823 /* create update dialog */ 823 /* create update dialog */
824 metaXML 824 metaXML
825 = glade_xml_new (GNUNET_GTK_get_glade_filename (), 825 = glade_xml_new (GNUNET_GTK_get_glade_filename (),
826 "namespaceUpdateDialog", PACKAGNUNET_GE_NAME); 826 "namespaceUpdateDialog", PACKAGE_NAME);
827 GNUNET_GTK_connect_glade_with_plugins (metaXML); 827 GNUNET_GTK_connect_glade_with_plugins (metaXML);
828 dialog = glade_xml_get_widget (metaXML, "namespaceUpdateDialog"); 828 dialog = glade_xml_get_widget (metaXML, "namespaceUpdateDialog");
829 gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); 829 gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
diff --git a/src/plugins/fs/namespace_create.c b/src/plugins/fs/namespace_create.c
index ac611bc4..2a0e13fe 100644
--- a/src/plugins/fs/namespace_create.c
+++ b/src/plugins/fs/namespace_create.c
@@ -176,7 +176,7 @@ create_namespace_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
176 GNUNET_GTK_DEBUG_BEGIN (); 176 GNUNET_GTK_DEBUG_BEGIN ();
177 metaXML 177 metaXML
178 = glade_xml_new (GNUNET_GTK_get_glade_filename (), 178 = glade_xml_new (GNUNET_GTK_get_glade_filename (),
179 "namespaceMetaDataDialog", PACKAGNUNET_GE_NAME); 179 "namespaceMetaDataDialog", PACKAGE_NAME);
180 GNUNET_GTK_connect_glade_with_plugins (metaXML); 180 GNUNET_GTK_connect_glade_with_plugins (metaXML);
181 dialog = glade_xml_get_widget (metaXML, "namespaceMetaDataDialog"); 181 dialog = glade_xml_get_widget (metaXML, "namespaceMetaDataDialog");
182 createMetaDataListTreeView (metaXML, 182 createMetaDataListTreeView (metaXML,
diff --git a/src/plugins/fs/search.c b/src/plugins/fs/search.c
index 514bae55..ea21c639 100644
--- a/src/plugins/fs/search.c
+++ b/src/plugins/fs/search.c
@@ -228,7 +228,7 @@ selectFile ()
228 228
229 uploadXML 229 uploadXML
230 = glade_xml_new (GNUNET_GTK_get_glade_filename (), 230 = glade_xml_new (GNUNET_GTK_get_glade_filename (),
231 "directorySaveDialog", PACKAGNUNET_GE_NAME); 231 "directorySaveDialog", PACKAGE_NAME);
232 GNUNET_GTK_connect_glade_with_plugins (uploadXML); 232 GNUNET_GTK_connect_glade_with_plugins (uploadXML);
233 dialog = GTK_FILE_CHOOSER (glade_xml_get_widget (uploadXML, 233 dialog = GTK_FILE_CHOOSER (glade_xml_get_widget (uploadXML,
234 "directorySaveDialog")); 234 "directorySaveDialog"));
@@ -411,7 +411,7 @@ fs_search_started (struct GNUNET_FSUI_SearchList * fsui_list,
411 list->searchXML 411 list->searchXML
412 = 412 =
413 glade_xml_new (GNUNET_GTK_get_glade_filename (), "searchResultsFrame", 413 glade_xml_new (GNUNET_GTK_get_glade_filename (), "searchResultsFrame",
414 PACKAGNUNET_GE_NAME); 414 PACKAGE_NAME);
415 GNUNET_GTK_connect_glade_with_plugins (list->searchXML); 415 GNUNET_GTK_connect_glade_with_plugins (list->searchXML);
416 list->searchpage 416 list->searchpage
417 = extractMainWidgetFromWindow (list->searchXML, "searchResultsFrame"); 417 = extractMainWidgetFromWindow (list->searchXML, "searchResultsFrame");
@@ -545,7 +545,7 @@ fs_search_started (struct GNUNET_FSUI_SearchList * fsui_list,
545 /* load label */ 545 /* load label */
546 list->labelXML 546 list->labelXML
547 = glade_xml_new (GNUNET_GTK_get_glade_filename (), 547 = glade_xml_new (GNUNET_GTK_get_glade_filename (),
548 "searchTabLabelWindow", PACKAGNUNET_GE_NAME); 548 "searchTabLabelWindow", PACKAGE_NAME);
549 GNUNET_GTK_connect_glade_with_plugins (list->labelXML); 549 GNUNET_GTK_connect_glade_with_plugins (list->labelXML);
550 list->tab_label 550 list->tab_label
551 = extractMainWidgetFromWindow (list->labelXML, "searchTabLabelWindow"); 551 = extractMainWidgetFromWindow (list->labelXML, "searchTabLabelWindow");
diff --git a/src/plugins/fs/upload.c b/src/plugins/fs/upload.c
index f1f4aa25..a85660cd 100644
--- a/src/plugins/fs/upload.c
+++ b/src/plugins/fs/upload.c
@@ -375,7 +375,7 @@ on_fsinsertuploadbutton_clicked_fs (gpointer dummy, GtkWidget * uploadButton)
375 "uploadFilenameComboBoxEntry"); 375 "uploadFilenameComboBoxEntry");
376 metaXML = 376 metaXML =
377 glade_xml_new (GNUNET_GTK_get_glade_filename (), "metaDataDialog", 377 glade_xml_new (GNUNET_GTK_get_glade_filename (), "metaDataDialog",
378 PACKAGNUNET_GE_NAME); 378 PACKAGE_NAME);
379 GNUNET_GTK_connect_glade_with_plugins (metaXML); 379 GNUNET_GTK_connect_glade_with_plugins (metaXML);
380 dialog = glade_xml_get_widget (metaXML, "metaDataDialog"); 380 dialog = glade_xml_get_widget (metaXML, "metaDataDialog");
381 meta = GNUNET_ECRS_meta_data_create (); 381 meta = GNUNET_ECRS_meta_data_create ();
@@ -455,7 +455,7 @@ selectFile (const char *oldfilename)
455 455
456 uploadXML 456 uploadXML
457 = glade_xml_new (GNUNET_GTK_get_glade_filename (), 457 = glade_xml_new (GNUNET_GTK_get_glade_filename (),
458 "uploadfilechooserdialog", PACKAGNUNET_GE_NAME); 458 "uploadfilechooserdialog", PACKAGE_NAME);
459 GNUNET_GTK_connect_glade_with_plugins (uploadXML); 459 GNUNET_GTK_connect_glade_with_plugins (uploadXML);
460 dialog = GTK_FILE_CHOOSER (glade_xml_get_widget (uploadXML, 460 dialog = GTK_FILE_CHOOSER (glade_xml_get_widget (uploadXML,
461 "uploadfilechooserdialog")); 461 "uploadfilechooserdialog"));