summaryrefslogtreecommitdiff
path: root/x11.c
diff options
context:
space:
mode:
Diffstat (limited to 'x11.c')
-rw-r--r--x11.c22
1 files changed, 0 insertions, 22 deletions
diff --git a/x11.c b/x11.c
index c902aeed..34bfd46c 100644
--- a/x11.c
+++ b/x11.c
@@ -2,8 +2,6 @@
* Hardware Information, version 0.3
* Copyright (C) 2003 Leandro Pereira <leandro@linuxmag.com.br>
*
- * May be modified and/or distributed under the terms of GNU GPL version 2.
- *
* This module contains code from xdpyinfo.c, by Jim Fulton, MIT X Consortium
* Copyright 1988, 1998 The Open Group
*
@@ -138,10 +136,8 @@ x11_get_widget(MainWindow * mainwindow)
{
GtkWidget *label, *hbox;
GtkWidget *table;
-#ifdef GTK2
GtkWidget *pixmap;
gchar *buf;
-#endif
X11Info *info;
if (!mainwindow)
@@ -155,14 +151,12 @@ x11_get_widget(MainWindow * mainwindow)
hbox = gtk_hbox_new(FALSE, 0);
gtk_widget_show(hbox);
-#ifdef GTK2
buf = g_strdup_printf("%s/x11.png", IMG_PREFIX);
pixmap = gtk_image_new_from_file(buf);
gtk_widget_set_usize(GTK_WIDGET(pixmap), 64, 0);
gtk_widget_show(pixmap);
gtk_box_pack_start(GTK_BOX(hbox), pixmap, FALSE, FALSE, 0);
g_free(buf);
-#endif
table = gtk_table_new(4, 2, FALSE);
gtk_widget_show(table);
@@ -174,42 +168,26 @@ x11_get_widget(MainWindow * mainwindow)
/*
* Table headers
*/
-#ifdef GTK2
label = gtk_label_new(_("<b>Display:</b>"));
gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
-#else
- label = gtk_label_new(_("Display:"));
-#endif
gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 0, 1);
gtk_widget_show(label);
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
-#ifdef GTK2
label = gtk_label_new(_("<b>Vendor:</b>"));
gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
-#else
- label = gtk_label_new(_("Vendor:"));
-#endif
gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 1, 2);
gtk_widget_show(label);
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
-#ifdef GTK2
label = gtk_label_new(_("<b>Release:</b>"));
gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
-#else
- label = gtk_label_new(_("Release:"));
-#endif
gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 2, 3);
gtk_widget_show(label);
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
-#ifdef GTK2
label = gtk_label_new(_("<b>Resolution:</b>"));
gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
-#else
- label = gtk_label_new(_("Resolution:"));
-#endif
gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 3, 4);
gtk_widget_show(label);
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);