Skip to content

Commit 04f3c7c

Browse files
committed
gui-install: remove dependency on libgnome
1 parent a9d099d commit 04f3c7c

22 files changed

+12
-2126
lines changed

usr/src/cmd/gui-install/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,8 @@ MSGFMT_OPTS =
132132
OBJEXT = o
133133
PACKAGE = gui-install
134134
PACKAGE_BUGREPORT =
135-
PACKAGE_CFLAGS = -DORBIT2=1 -D_REENTRANT -D_PTHREADS -I/usr/include/libgnomeui-2.0 -I/usr/include/libgnome-2.0 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/gtk-2.0 -I/usr/include/libart-2.0 -I/usr/include/gconf/2 -I/usr/include/libbonoboui-2.0 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/gnome-keyring-1 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/orbit-2.0 -I/usr/include/libbonobo-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/pango-1.0 -I/usr/sfw/include/freetype2 -I/usr/sfw/include -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/libxml2 -I/usr/include/libglade-2.0
136-
PACKAGE_LIBS = -R/usr/lib -lgnomeui-2 -lSM -lICE -lbonoboui-2 -lgnome-keyring -lgnomecanvas-2 -lgnome-2 -lart_lgpl_2 -lpangoft2-1.0 -lbonobo-2 -lgnomevfs-2 -lbonobo-activation -lpopt -lgconf-2 -lORBit-2 -lgthread-2.0 -lthread -lglade-2.0 -lgtk-x11-2.0 -lxml2 -lpthread -lz -lsocket -lnsl -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lglib-2.0
135+
PACKAGE_CFLAGS = -DORBIT2=1 -D_REENTRANT -D_PTHREADS -I/usr/include/gtk-2.0 -I/usr/include/libart-2.0 -I/usr/include/gconf/2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/sfw/include/freetype2 -I/usr/sfw/include -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/libxml2 -I/usr/include/libglade-2.0
136+
PACKAGE_LIBS = -lSM -lICE -lpangoft2-1.0 -lpopt -lgconf-2 -lORBit-2 -lgthread-2.0 -lthread -lglade-2.0 -lgtk-x11-2.0 -lxml2 -lpthread -lz -lsocket -lnsl -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lglib-2.0
137137
PACKAGE_NAME =
138138
PACKAGE_STRING =
139139
PACKAGE_TARNAME =

usr/src/cmd/gui-install/src/Makefile

+4-4
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,8 @@ MSGFMT = /usr/bin/msgfmt
144144
OBJEXT = o
145145
PACKAGE = gui-install
146146
PACKAGE_BUGREPORT =
147-
PACKAGE_CFLAGS = -DORBIT2=1 -D_REENTRANT -D_PTHREADS -I/usr/include/libgnomeui-2.0 -I/usr/include/libgnome-2.0 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/gtk-2.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/libart-2.0 -I/usr/include/gconf/2 -I/usr/include/libbonoboui-2.0 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/gnome-keyring-1 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/orbit-2.0 -I/usr/include/libbonobo-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/pango-1.0 -I/usr/sfw/include/freetype2 -I/usr/sfw/include -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/libxml2 -I/usr/include/libglade-2.0
148-
PACKAGE_LIBS = -R/usr/lib -lgnomeui-2 -lSM -lICE -lbonoboui-2 -lgnome-keyring -lgnomecanvas-2 -lgnome-2 -lart_lgpl_2 -lpangoft2-1.0 -lbonobo-2 -lgnomevfs-2 -lbonobo-activation -lpopt -lgconf-2 -lORBit-2 -lgthread-2.0 -lthread -lglade-2.0 -lgtk-x11-2.0 -lxml2 -lpthread -lz -lsocket -lnsl -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lglib-2.0
147+
PACKAGE_CFLAGS = -DORBIT2=1 -D_REENTRANT -D_PTHREADS -I/usr/include/gtk-2.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gconf/2 -I/usr/include/libbonoboui-2.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/orbit-2.0 -I/usr/include/libbonobo-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/pango-1.0 -I/usr/sfw/include/freetype2 -I/usr/sfw/include -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/libxml2 -I/usr/include/libglade-2.0
148+
PACKAGE_LIBS = -lSM -lICE -lpangoft2-1.0 -lbonobo-2 -lbonobo-activation -lpopt -lgconf-2 -lORBit-2 -lgthread-2.0 -lthread -lglade-2.0 -lgtk-x11-2.0 -lxml2 -lpthread -lz -lsocket -lnsl -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lglib-2.0
149149
PACKAGE_NAME =
150150
PACKAGE_STRING =
151151
PACKAGE_TARNAME =
@@ -212,7 +212,7 @@ INCLUDES = \
212212
-DGLADEDIR=\""$(datadir)/$(PACKAGE)"\" \
213213
-DTEXTDIR=\""$(datadir)/$(PACKAGE)"\" \
214214
-DPIXMAPDIR=\""$(datadir)/$(PACKAGE)"\" \
215-
-DORBIT2=1 -D_REENTRANT -D_PTHREADS -I/usr/include/libgnomeui-2.0 -I/usr/include/libgnome-2.0 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/gtk-2.0 -I/usr/include/libart-2.0 -I/usr/include/gconf/2 -I/usr/include/libbonoboui-2.0 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/gnome-keyring-1 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/orbit-2.0 -I/usr/include/libbonobo-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/pango-1.0 -I/usr/sfw/include/freetype2 -I/usr/sfw/include -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/libxml2 -I/usr/include/libglade-2.0 -I/usr/include/gdk-pixbuf-2.0
215+
-DORBIT2=1 -D_REENTRANT -D_PTHREADS -I/usr/include/gtk-2.0 -I/usr/include/gconf/2 -I/usr/include/libbonoboui-2.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/orbit-2.0 -I/usr/include/libbonobo-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/pango-1.0 -I/usr/sfw/include/freetype2 -I/usr/sfw/include -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/libxml2 -I/usr/include/libglade-2.0 -I/usr/include/gdk-pixbuf-2.0
216216

217217
orchestrator_wrapper_SOURCES = \
218218
orchestrator-wrappers.c \
@@ -272,7 +272,7 @@ gui_install_SOURCES = \
272272
disk-block-order.c disk-block-order.h
273273

274274

275-
gui_install_LDADD = -R/usr/lib -lgnomeui-2 -lSM -lICE -lbonoboui-2 -lgnome-keyring -lgnomecanvas-2 -lgnome-2 -lart_lgpl_2 -lpangoft2-1.0 -lbonobo-2 -lgnomevfs-2 -lbonobo-activation -lpopt -lgconf-2 -lORBit-2 -lgthread-2.0 -lthread -lglade-2.0 -lgtk-x11-2.0 -lxml2 -lpthread -lz -lsocket -lnsl -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 $(INTLLIBS)
275+
gui_install_LDADD = -lSM -lICE -lpangoft2-1.0 -lpopt -lgconf-2 -lORBit-2 -lgthread-2.0 -lthread -lglade-2.0 -lgtk-x11-2.0 -lxml2 -lpthread -lz -lsocket -lnsl -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 $(INTLLIBS)
276276

277277
gladedir = $(datadir)/$(PACKAGE)
278278
glade_DATA = \

usr/src/cmd/gui-install/src/callbacks.c

-57
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
#endif
2828

2929
#include <sys/wait.h>
30-
#include <gnome.h>
3130
#include <libbe.h>
3231

3332
#include "installation-profile.h"
@@ -175,12 +174,6 @@ prompt_quit()
175174
_("Do you want to quit this installation ?"),
176175
NULL);
177176
break;
178-
case INSTALLATION_TYPE_INPLACE_UPGRADE:
179-
ret_val = gui_install_prompt_dialog(TRUE, FALSE, FALSE,
180-
GTK_MESSAGE_WARNING,
181-
_("Do you want to quit this installation ?"),
182-
NULL);
183-
break;
184177
}
185178
return (ret_val);
186179
}
@@ -307,14 +300,6 @@ on_nextbutton_clicked(GtkButton *button,
307300
MainWindow.InstallationDiskWindow.diskselectiontoplevel);
308301
installationdisk_screen_set_default_focus( FALSE );
309302
break;
310-
case INSTALLATION_TYPE_INPLACE_UPGRADE:
311-
if (MainWindow.MileStoneComplete[OM_UPGRADE_TARGET_DISCOVERY]
312-
== FALSE)
313-
gtk_widget_set_sensitive(MainWindow.nextbutton, FALSE);
314-
gtk_widget_hide(
315-
MainWindow.InstallationDiskWindow.diskselectiontoplevel);
316-
show_upgrade_screen(TRUE);
317-
break;
318303
}
319304

320305
gtk_widget_set_sensitive(MainWindow.backbutton, TRUE);
@@ -421,14 +406,6 @@ on_nextbutton_clicked(GtkButton *button,
421406
gtk_label_set_label(GTK_LABEL(MainWindow.userlabel),
422407
MainWindow.InactiveStageTitles[USER_SCREEN]);
423408
break;
424-
case INSTALLATION_TYPE_INPLACE_UPGRADE:
425-
show_upgrade_screen(FALSE);
426-
gtk_widget_show(MainWindow.upgradebutton);
427-
gtk_widget_set_sensitive(MainWindow.upgradebutton, TRUE);
428-
gtk_widget_grab_default(MainWindow.upgradebutton);
429-
gtk_label_set_label(GTK_LABEL(MainWindow.disklabel),
430-
MainWindow.InactiveStageTitles[DISK_SCREEN]);
431-
break;
432409
}
433410
confirmation_screen_set_contents();
434411
gtk_widget_show(
@@ -468,10 +445,6 @@ on_nextbutton_clicked(GtkButton *button,
468445
case INSTALLATION_TYPE_INITIAL_INSTALL:
469446
gtk_widget_set_sensitive(MainWindow.installbutton, FALSE);
470447
break;
471-
472-
case INSTALLATION_TYPE_INPLACE_UPGRADE:
473-
gtk_widget_set_sensitive(MainWindow.upgradebutton, FALSE);
474-
break;
475448
}
476449

477450
gtk_widget_show(
@@ -511,9 +484,6 @@ on_nextbutton_clicked(GtkButton *button,
511484
case INSTALLATION_TYPE_INITIAL_INSTALL:
512485
gtk_widget_set_sensitive(MainWindow.installbutton, FALSE);
513486
break;
514-
case INSTALLATION_TYPE_INPLACE_UPGRADE:
515-
gtk_widget_set_sensitive(MainWindow.upgradebutton, FALSE);
516-
break;
517487
}
518488
gtk_widget_grab_default(MainWindow.quitbutton);
519489

@@ -539,9 +509,6 @@ on_nextbutton_clicked(GtkButton *button,
539509
case INSTALLATION_TYPE_INITIAL_INSTALL:
540510
gtk_widget_hide(MainWindow.installbutton);
541511
break;
542-
case INSTALLATION_TYPE_INPLACE_UPGRADE:
543-
gtk_widget_hide(MainWindow.upgradebutton);
544-
break;
545512
}
546513

547514
finish_screen_set_contents();
@@ -593,11 +560,6 @@ on_backbutton_clicked(GtkButton *button,
593560
gtk_widget_hide(MainWindow.installbutton);
594561
InstallCurrScreen--;
595562
break;
596-
case INSTALLATION_TYPE_INPLACE_UPGRADE:
597-
/* Short circuit back to the DISK_SCREEN */
598-
gtk_widget_hide(MainWindow.upgradebutton);
599-
InstallCurrScreen = DISK_SCREEN;
600-
break;
601563
}
602564
gtk_widget_show(MainWindow.nextbutton);
603565
gtk_widget_grab_default(MainWindow.nextbutton);
@@ -635,9 +597,6 @@ on_backbutton_clicked(GtkButton *button,
635597
gtk_widget_hide(
636598
MainWindow.InstallationDiskWindow.diskselectiontoplevel);
637599
break;
638-
case INSTALLATION_TYPE_INPLACE_UPGRADE:
639-
show_upgrade_screen(FALSE);
640-
break;
641600
}
642601
gtk_label_set_label(GTK_LABEL(MainWindow.disklabel),
643602
MainWindow.InactiveStageTitles[DISK_SCREEN]);
@@ -665,19 +624,6 @@ on_backbutton_clicked(GtkButton *button,
665624
MainWindow.InstallationDiskWindow.diskselectiontoplevel);
666625
installationdisk_screen_set_default_focus( TRUE );
667626
break;
668-
case INSTALLATION_TYPE_INPLACE_UPGRADE:
669-
gtk_widget_hide(
670-
MainWindow.ConfirmationWindow.confirmationtoplevel);
671-
gtk_widget_hide(MainWindow.upgradebutton);
672-
title = g_strdup_printf(InactiveStageTitleMarkup,
673-
gtk_label_get_text(GTK_LABEL(
674-
MainWindow.installationlabel)));
675-
gtk_label_set_label(GTK_LABEL(MainWindow.installationlabel),
676-
title);
677-
gtk_widget_show(MainWindow.nextbutton);
678-
show_upgrade_screen(TRUE);
679-
g_free(title);
680-
break;
681627
}
682628
gtk_widget_set_sensitive(MainWindow.backbutton, TRUE);
683629
gtk_widget_set_sensitive(MainWindow.nextbutton, TRUE);
@@ -930,9 +876,6 @@ on_licensecheckbutton_toggled(GtkToggleButton *togglebutton,
930876
case INSTALLATION_TYPE_INITIAL_INSTALL:
931877
button = MainWindow.installbutton;
932878
break;
933-
case INSTALLATION_TYPE_INPLACE_UPGRADE:
934-
button = MainWindow.upgradebutton;
935-
break;
936879
}
937880

938881
gtk_widget_set_sensitive(button,

usr/src/cmd/gui-install/src/callbacks.h

-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ extern "C" {
3535
#include <config.h>
3636
#endif
3737
#include <orchestrator_api.h>
38-
#include <gnome.h>
3938
void target_discovery_callback(om_callback_info_t *cb_data,
4039
uintptr_t app_data);
4140

usr/src/cmd/gui-install/src/confirmation-screen.c

-72
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
#endif
2828

2929
#include <gtk/gtk.h>
30-
#include <gnome.h>
3130
#include <glade/glade-build.h>
3231
#include "installation-profile.h"
3332
#include "interface-globals.h"
@@ -493,77 +492,6 @@ confirmation_screen_set_contents(void)
493492
}
494493
break;
495494

496-
case INSTALLATION_TYPE_INPLACE_UPGRADE:
497-
498-
/* Disk Information */
499-
gtk_widget_show(MainWindow.ConfirmationWindow.diskvbox);
500-
501-
diskSize = InstallationProfile.disksize;
502-
503-
if (InstallationProfile.releasename != NULL) {
504-
if (InstallationProfile.diskname != NULL) {
505-
tmpStr =
506-
g_strdup_printf(
507-
_("%.1f GB disk (%s) with %s"),
508-
diskSize,
509-
InstallationProfile.diskname,
510-
InstallationProfile.releasename);
511-
} else {
512-
tmpStr =
513-
g_strdup_printf(
514-
_("%.1f GB disk with %s"),
515-
diskSize,
516-
InstallationProfile.releasename);
517-
}
518-
} else {
519-
if (InstallationProfile.diskname != NULL) {
520-
tmpStr =
521-
g_strdup_printf(
522-
_("%.1f GB disk (%s)"),
523-
diskSize,
524-
InstallationProfile.diskname);
525-
} else {
526-
tmpStr =
527-
g_strdup_printf(
528-
_("%.1f GB disk"),
529-
diskSize);
530-
}
531-
}
532-
533-
add_detail_hbox(
534-
MainWindow.ConfirmationWindow.diskvbox,
535-
FALSE, FALSE, tmpStr, NULL);
536-
g_free(tmpStr);
537-
538-
/* Software Information */
539-
gtk_widget_show(
540-
MainWindow.ConfirmationWindow.softwarevbox);
541-
542-
add_detail_hbox(
543-
MainWindow.ConfirmationWindow.softwarevbox,
544-
FALSE, FALSE,
545-
_("OpenIndiana"),
546-
NULL);
547-
548-
add_detail_hbox(
549-
MainWindow.ConfirmationWindow.softwarevbox,
550-
FALSE, FALSE,
551-
_("Desktop (GNOME)"),
552-
NULL);
553-
554-
/* Timezone Information */
555-
gtk_widget_hide(
556-
MainWindow.ConfirmationWindow.timezonevbox);
557-
558-
/* Languages Information */
559-
gtk_widget_hide(
560-
MainWindow.ConfirmationWindow.languagesvbox);
561-
562-
/* Account Information Always hidden on an upgrade */
563-
gtk_widget_hide(
564-
MainWindow.ConfirmationWindow.accountvbox);
565-
566-
break;
567495
}
568496
#ifdef POST_PREVIEW_RELEASE
569497
gtk_toggle_button_set_active(

usr/src/cmd/gui-install/src/datetimezone-screen.c

-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
#include <time.h>
3737
#include <libzoneinfo.h>
3838

39-
#include <gnome.h>
4039
#include <glade/glade.h>
4140
#include "callbacks.h"
4241
#include "interface-globals.h"

usr/src/cmd/gui-install/src/disk-block-order.c

-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
*/
2525
#include <ctype.h>
2626
#include <math.h>
27-
#include <gnome.h>
2827

2928
#include "orchestrator-wrappers.h"
3029
#include "installation-disk-screen.h"

usr/src/cmd/gui-install/src/error-logging.c

-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
#include <unistd.h>
2828
#include <stdio.h>
2929
#include <config.h>
30-
#include <gnome.h>
3130
#include "orchestrator-wrappers.h"
3231
#include "installation-disk-screen.h"
3332
#include "disk-block-order.h"

usr/src/cmd/gui-install/src/failure-screen.c

-20
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
#endif
2828

2929
#include <gtk/gtk.h>
30-
#include <gnome.h>
3130
#include <glade/glade-build.h>
3231
#include <ctype.h>
3332
#include "installation-profile.h"
@@ -94,12 +93,6 @@ on_failurelogbutton_clicked(GtkWidget *widget,
9493
MainWindow.TextFileLocations[INSTALL_LOG],
9594
FALSE, FALSE, TRUE);
9695
break;
97-
case INSTALLATION_TYPE_INPLACE_UPGRADE:
98-
show_locale_file_in_textview(
99-
MainWindow.FailureWindow.installlogtextview,
100-
MainWindow.TextFileLocations[UPGRADE_LOG],
101-
FALSE, FALSE, TRUE);
102-
break;
10396
}
10497

10598
initialised = TRUE;
@@ -132,11 +125,6 @@ installation_log_init(void)
132125
MainWindow.FailureWindow.installlogdialog),
133126
_("Installation Log"));
134127
break;
135-
case INSTALLATION_TYPE_INPLACE_UPGRADE:
136-
gtk_window_set_title(GTK_WINDOW(
137-
MainWindow.FailureWindow.installlogdialog),
138-
_("Upgrade Log"));
139-
break;
140128
}
141129

142130
g_signal_connect(
@@ -181,14 +169,6 @@ failure_screen_set_contents(void)
181169
buttonstr = g_strdup_printf(buttonmarkup,
182170
_("OpenIndiana installation log"));
183171
break;
184-
185-
case INSTALLATION_TYPE_INPLACE_UPGRADE:
186-
labelstr = g_strdup_printf(labelmarkup,
187-
_("OpenIndiana Developer Preview 2 upgrade did not complete normally. "
188-
"The system has been restored to its previous state."));
189-
buttonstr = g_strdup_printf(buttonmarkup,
190-
_("OpenIndiana upgrade log"));
191-
break;
192172
}
193173
gtk_label_set_label(GTK_LABEL(
194174
MainWindow.FailureWindow.failureinfolabel),

usr/src/cmd/gui-install/src/finish-screen.c

-20
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
#endif
2828

2929
#include <sys/wait.h>
30-
#include <gnome.h>
3130
#include <gdk/gdkkeysyms.h>
3231
#include <glade/glade.h>
3332
#include "interface-globals.h"
@@ -99,12 +98,6 @@ on_logbutton_clicked(GtkWidget *widget,
9998
MainWindow.TextFileLocations[INSTALL_LOG],
10099
FALSE, FALSE, TRUE);
101100
break;
102-
case INSTALLATION_TYPE_INPLACE_UPGRADE:
103-
show_locale_file_in_textview(
104-
MainWindow.FinishWindow.installationlogtextview,
105-
MainWindow.TextFileLocations[UPGRADE_LOG],
106-
FALSE, FALSE, TRUE);
107-
break;
108101
}
109102
initialised = TRUE;
110103
}
@@ -137,11 +130,6 @@ installation_log_init(void)
137130
MainWindow.FinishWindow.installationlogdialog),
138131
_("Installation Log"));
139132
break;
140-
case INSTALLATION_TYPE_INPLACE_UPGRADE:
141-
gtk_window_set_title(GTK_WINDOW(
142-
MainWindow.FinishWindow.installationlogdialog),
143-
_("Upgrade Log"));
144-
break;
145133
}
146134
g_signal_connect(G_OBJECT(MainWindow.FinishWindow.installationlogclosebutton), "clicked",
147135
G_CALLBACK(installation_log_hide),
@@ -175,14 +163,6 @@ finish_screen_set_contents(void)
175163
buttonstr = g_strdup_printf(buttonmarkup,
176164
_("OpenIndiana installation log"));
177165
break;
178-
179-
case INSTALLATION_TYPE_INPLACE_UPGRADE:
180-
labelstr = g_strdup_printf(labelmarkup,
181-
_("OpenIndiana upgrade is complete. Review the "
182-
"OpenIndiana upgrade log for more information"));
183-
buttonstr = g_strdup_printf(buttonmarkup,
184-
_("OpenIndiana upgrade log"));
185-
break;
186166
}
187167
gtk_label_set_label(GTK_LABEL(
188168
MainWindow.FinishWindow.finishlabel),

0 commit comments

Comments
 (0)