From patchwork Wed Sep 22 17:07:54 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaud Lacombe X-Patchwork-Id: 199962 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o8MHC7mS026890 for ; Wed, 22 Sep 2010 17:12:07 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753412Ab0IVRMG (ORCPT ); Wed, 22 Sep 2010 13:12:06 -0400 Received: from mail-yw0-f46.google.com ([209.85.213.46]:47481 "EHLO mail-yw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752826Ab0IVRMF (ORCPT ); Wed, 22 Sep 2010 13:12:05 -0400 Received: by ywh1 with SMTP id 1so242497ywh.19 for ; Wed, 22 Sep 2010 10:12:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=d+6hEyGKDFwrumNkZw+FXUsNnDywuAgkgA6Pi1d1mHc=; b=QbeAyhjk5/+PHMByRL2TZmhXzlYyyqfBREQ+S0BXMB/EvTOp4nd1tOA/+1L+XvxmG4 c1LyKQY2zLNn9S0enfq5ZYUPc4sLt3fd1H73bFQFeTyTMwh4lPu9Q+pNgUcTjbVTsHkD 0vnAXUzRJNQ8M5ToHI/TZZXoZ3vceHu3B8ZPg= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=Csc3cpk0mpGgXE4AMOq0VMUrXzXRYpJuq45Bf9s/+ZgAj3VAF5Ofv5sx+/nEHQx/ZK lxN1Z26ibEu6f86pq5geCzW6O6qdb78t9UaZj1azCa6pOj3ojUJjIX3Q37gyhTd2qx3R sQqnNSsdWmxgzmMEr9AgwPtVdxZsjfwAPwYGQ= Received: by 10.220.35.137 with SMTP id p9mr289395vcd.56.1285175524688; Wed, 22 Sep 2010 10:12:04 -0700 (PDT) Received: from localhost.localdomain (69-165-136-93.dsl.teksavvy.com [69.165.136.93]) by mx.google.com with ESMTPS id r35sm6300316vbw.17.2010.09.22.10.12.02 (version=SSLv3 cipher=RC4-MD5); Wed, 22 Sep 2010 10:12:03 -0700 (PDT) From: Arnaud Lacombe To: Sam Ravnborg , Michal Marek Cc: linux-kbuild , Arnaud Lacombe Subject: [DIFF] kbuild-generic-v6 -> kbuild/kconfig/kbuild-generic-v7 Date: Wed, 22 Sep 2010 13:07:54 -0400 Message-Id: <1285175274-10232-1-git-send-email-lacombar@gmail.com> X-Mailer: git-send-email 1.7.2.30.gc37d7.dirty In-Reply-To: <1284264744-27530-1-git-send-email-lacombar@gmail.com> References: <1284264744-27530-1-git-send-email-lacombar@gmail.com> Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Wed, 22 Sep 2010 17:12:07 +0000 (UTC) diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index 7d48a51..4558961 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c @@ -1527,12 +1527,6 @@ int main(int ac, char *av[]) else glade_file = g_strconcat(g_get_current_dir(), "/", av[0], ".glade", NULL); - /* Load the interface and connect signals */ - init_main_window(glade_file); - init_tree_model(); - init_left_tree(); - init_right_tree(); - /* Conf stuffs */ if (ac > 1 && av[1][0] == '-') { switch (av[1][1]) { @@ -1552,6 +1546,12 @@ int main(int ac, char *av[]) fixup_rootmenu(&rootmenu); conf_read(NULL); + /* Load the interface and connect signals */ + init_main_window(glade_file); + init_tree_model(); + init_left_tree(); + init_right_tree(); + switch (view_mode) { case SINGLE_VIEW: display_tree_part(); diff --git a/scripts/kconfig/nconf.c b/scripts/kconfig/nconf.c index ed93dd0..545e1af 100644 --- a/scripts/kconfig/nconf.c +++ b/scripts/kconfig/nconf.c @@ -702,7 +702,7 @@ static int do_exit(void) char buf[1024]; snprintf(buf, 1024, _("Configuration written to %s\n" - "End of the configuration.\n": + "End of the configuration.\n" "Execute 'make' to start the build or try" " 'make help'."), filename); btn_dialog( diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc index 902086f..06dd2e3 100644 --- a/scripts/kconfig/qconf.cc +++ b/scripts/kconfig/qconf.cc @@ -1274,7 +1274,7 @@ ConfigMainWindow::ConfigMainWindow(void) char title[256]; QDesktopWidget *d = configApp->desktop(); - snprintf(title, sizeof(title), "%s%s"), + snprintf(title, sizeof(title), "%s%s", rootmenu.prompt->text, #if QT_VERSION < 0x040000 " (Qt3)"