[hipl-commit] [trunk] Rev 4315: Remove disabled code from the lib/gui/ directory.
- From: Diego Biurrun <diego@xxxxxxxxxx>
- To: hipl-commit@xxxxxxxxxxxxx
- Date: Fri, 16 Apr 2010 03:47:32 +0300
Committer: Diego Biurrun <diego@xxxxxxxxxx>
Date: 16/04/2010 at 03:47:32
Revision: 4315
Revision-id: diego@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Branch nick: trunk
Log:
Remove disabled code from the lib/gui/ directory.
Modified:
M lib/gui/create.c
M lib/gui/hipgui.c
M lib/gui/tools.c
=== modified file 'lib/gui/create.c'
--- lib/gui/create.c 2010-04-13 10:59:42 +0000
+++ lib/gui/create.c 2010-04-16 00:47:16 +0000
@@ -367,8 +367,6 @@
/* When user right clicks status icon. */
g_signal_connect(status_icon, "popup-menu",
G_CALLBACK(e_menu_status_icon), (gpointer) "popup-menu");
- /* When user double clicks status icon. */
-// g_signal_connect(status_icon, "activate", G_CALLBACK(e_button),
(gpointer)IDB_SYSTRAY);
/* Create menu for status icon. */
w = gtk_menu_new();
@@ -442,12 +440,8 @@
model = gtk_tree_store_new(1, G_TYPE_STRING);
list = gtk_tree_view_new();
- /* This signal occurs when user double clicks item in list. */
-// g_signal_connect(list, "row-activated", G_CALLBACK(e_row_activated),
(gpointer)"remote-hit-list");
/* Check when user changes selection in list. */
g_signal_connect(list, "cursor-changed", G_CALLBACK(e_cursor_changed),
(gpointer) "remote-hit-list");
- /* This could be used to example popup a menu when user click right mouse
button. */
-// g_signal_connect(list, "button-press-event", G_CALLBACK(e_button_press),
(gpointer)"remote-hit-list");
widget_set(ID_RLISTVIEW, list);
/* Setup list for dragndrop. */
@@ -911,32 +905,6 @@
gtk_box_pack_start(GTK_BOX(vb2), hb, FALSE, FALSE, 1);
gtk_widget_show(GTK_WIDGET(hb));
-#if 0
- w = gtk_label_new(lang_get("nhdlg-url"));
- gtk_box_pack_start(GTK_BOX(hb), w, FALSE, FALSE, 5);
- gtk_widget_show(GTK_WIDGET(w));
- w = gtk_entry_new();
- gtk_entry_set_text(GTK_ENTRY(w), "");
- gtk_box_pack_start(GTK_BOX(hb), w, TRUE, TRUE, 5);
- gtk_entry_set_max_length(GTK_ENTRY(w), MAX_URL_LEN);
- gtk_entry_set_activates_default(GTK_ENTRY(w), TRUE);
- gtk_widget_show(GTK_WIDGET(w));
- widget_set(ID_NH_URL, w);
-
-
- w = gtk_label_new(lang_get("nhdlg-port"));
- gtk_box_pack_start(GTK_BOX(hb), w, FALSE, FALSE, 5);
- gtk_widget_show(GTK_WIDGET(w));
- w = gtk_entry_new();
- gtk_entry_set_text(GTK_ENTRY(w), "0");
- gtk_box_pack_start(GTK_BOX(hb), w, FALSE, TRUE, 5);
- gtk_widget_set_size_request(GTK_WIDGET(w), 70, -1);
- gtk_entry_set_max_length(GTK_ENTRY(w), 8);
- gtk_entry_set_activates_default(GTK_ENTRY(w), TRUE);
- gtk_widget_show(GTK_WIDGET(w));
- widget_set(ID_NH_PORT, w);
-#endif
-
frame = gtk_frame_new(NULL);
gtk_frame_set_label(GTK_FRAME(frame), lang_get("nhdlg-g-info"));
gtk_frame_set_label_align(GTK_FRAME(frame), 0.0, 0.0);
=== modified file 'lib/gui/hipgui.c'
--- lib/gui/hipgui.c 2010-04-13 10:59:42 +0000
+++ lib/gui/hipgui.c 2010-04-16 00:47:16 +0000
@@ -124,7 +124,6 @@
/* Set default icon. */
gtk_window_set_default_icon_from_file(HIP_DEBIAN_DIR_PIXMAPS
"/hipmanager.png", NULL);
-// gtk_window_set_default_icon_name("hipmanager.png");
/* Initialize tooltips. */
widget_set(ID_TOOLTIPS, gtk_tooltips_new());
@@ -221,7 +220,6 @@
/* Clear HIT/group edit. */
edit_group_remote(lang_get("default-group-name"));
-// edit_reset();
/* Close all groups as default. */
gtk_tree_view_collapse_all(GTK_TREE_VIEW(widget(ID_RLISTVIEW)));
@@ -304,7 +302,6 @@
/* If manual input wanted. */
if (inout == 2) {
gtk_editable_set_editable(widget(ID_NH_HIT), TRUE);
-// gtk_widget_set_sensitive(GTK_WIDGET(widget(ID_NH_HIT)), TRUE);
gtk_entry_set_text(GTK_ENTRY(widget(ID_NH_HIT)),
"2001:0010:0000:0000:0000:0000:0000:0000");
gtk_editable_select_region(widget(ID_NH_HIT), 0, -1);
@@ -313,7 +310,6 @@
memset(hit, 0, sizeof(HIT_Remote));
} else {
gtk_editable_set_editable(widget(ID_NH_HIT), FALSE);
-// gtk_widget_set_sensitive(GTK_WIDGET(widget(ID_NH_HIT)), FALSE);
print_hit_to_buffer(phit, &hit->hit);
gtk_entry_set_text(GTK_ENTRY(widget(ID_NH_HIT)), phit);
gtk_entry_set_text(GTK_ENTRY(widget(ID_NH_NAME)), hit->name);
@@ -360,7 +356,6 @@
gtk_widget_destroy(GTK_WIDGET(d));
} else if (check_name_hit(hit->name, NULL)) {
pthread_create(&pt, NULL, _hit_remote_add_thread, hit);
- //pthread_join(pt, NULL);
break;
}
} else if (check_name_hit(hit->name, NULL)) {
=== modified file 'lib/gui/tools.c'
--- lib/gui/tools.c 2010-04-15 16:57:50 +0000
+++ lib/gui/tools.c 2010-04-16 00:47:16 +0000
@@ -501,7 +501,6 @@
g->lightweight = lw;
pthread_create(&pt, NULL, _group_remote_add_thread, g);
- //pthread_join(pt, NULL);
err = 0;
} else {err = -1;
}
@@ -968,12 +967,6 @@
NAMECPY(ud.old_name, r->name);
NAMECPY(ud.new_name, str);
NAMECPY(r->name, str);
-#if 0
- ps = (char *) gtk_entry_get_text(GTK_ENTRY(widget(ID_TWR_URL)));
- URLCPY(r->url, ps);
- ps = (char *) gtk_entry_get_text(GTK_ENTRY(widget(ID_TWR_PORT)));
- URLCPY(r->port, ps);
-#endif
ud.depth = 2;
ud.indices_first = -1;
Other related posts:
- » [hipl-commit] [trunk] Rev 4315: Remove disabled code from the lib/gui/ directory. - Diego Biurrun
