Author: michael_meeks Date: Wed Apr 16 17:22:39 2008 New Revision: 46752 URL: http://svn.opensuse.org/viewcvs/yast?rev=46752&view=rev Log: 2008-04-16 Michael Meeks <michael.meeks@novell.com> * src/YGUI.cc, src/YGPackageSelector.cc: fix a few format * warnings. * src/ygdkmngloader.c: fix unitialized variable Modified: trunk/gtk/ChangeLog trunk/gtk/src/YGPackageSelector.cc trunk/gtk/src/YGUI.cc trunk/gtk/src/ygdkmngloader.c Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=46752&r1=46... ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Wed Apr 16 17:22:39 2008 @@ -1,3 +1,8 @@ +2008-04-16 Michael Meeks <michael.meeks@novell.com> + + * src/YGUI.cc, src/YGPackageSelector.cc: fix a few format warnings. + * src/ygdkmngloader.c: fix unitialized variable + 2008-03-26 Ricardo Cruz <rpmcruz@alunos.dcc.fc.up.pt> * src/yzyppwrapper.cc: fixed Patterns install_packages() warning. Modified: trunk/gtk/src/YGPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGPackageSelector.cc?rev=... ============================================================================== --- trunk/gtk/src/YGPackageSelector.cc (original) +++ trunk/gtk/src/YGPackageSelector.cc Wed Apr 16 17:22:39 2008 @@ -2009,9 +2009,9 @@ GtkWidget *dialog, *view; dialog = gtk_message_dialog_new (YGDialog::currentWindow(), - GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_WARNING, - GTK_BUTTONS_OK, _("Disk Almost Full !")); - gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), + GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_WARNING, + GTK_BUTTONS_OK, "%s", _("Disk Almost Full !")); + gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s", _("One of the partitions is reaching its limit of capacity. You may " "have to remove packages if you wish to install some.")); @@ -2286,8 +2286,8 @@ dialog = gtk_message_dialog_new (YGDialog::currentWindow(), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_WARNING, - GTK_BUTTONS_NONE, _("Changes not saved!")); - gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), + GTK_BUTTONS_NONE, "%s", _("Changes not saved!")); + gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s", _("Quit anyway?")); gtk_dialog_add_buttons (GTK_DIALOG (dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_NO, GTK_STOCK_QUIT, GTK_RESPONSE_YES, NULL); @@ -2441,9 +2441,9 @@ // interface GtkWidget *dialog = gtk_message_dialog_new (YGDialog::currentWindow(), - GtkDialogFlags (0), GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, - _("There are some conflicts on the transaction that must be " - "solved manually.")); + GtkDialogFlags (0), GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, "%s", + _("There are some conflicts on the transaction that must be " + "solved manually.")); gtk_dialog_add_buttons (GTK_DIALOG (dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_APPLY, GTK_RESPONSE_APPLY, NULL); @@ -2507,10 +2507,10 @@ static void errorMsg (const std::string &header, const std::string &message) { GtkWidget *dialog = gtk_message_dialog_new (YGDialog::currentWindow(), - GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, - header.c_str(), NULL); + GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, + "%s", header.c_str()); gtk_message_dialog_format_secondary_markup (GTK_MESSAGE_DIALOG (dialog), - message.c_str()); + "%s", message.c_str()); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); } @@ -2565,25 +2565,25 @@ msg += dirname; GtkWidget *dialog = gtk_message_dialog_new (YGDialog::currentWindow(), - GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_INFO, GTK_BUTTONS_OK_CANCEL, - _("Create Dependency Resolver Test Case"), NULL); + GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_INFO, GTK_BUTTONS_OK_CANCEL, + "%s", _("Create Dependency Resolver Test Case")); gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), - msg.c_str()); + "%s", msg.c_str()); int ret = gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); if (ret == GTK_RESPONSE_OK) { if (Ypp::get()->createSolverTestcase (dirname)) { GtkWidget *dialog = gtk_message_dialog_new (YGDialog::currentWindow(), - GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, - GTK_BUTTONS_YES_NO, _("Success"), NULL); + GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, + GTK_BUTTONS_YES_NO, "%s", _("Success")); msg = _("Dependency resolver test case written to"); msg += " <tt>"; msg += dirname; msg += "</tt>\n"; msg += _("Prepare <tt>y2logs.tgz tar</tt> archive to attach to Bugzilla?"); gtk_message_dialog_format_secondary_markup (GTK_MESSAGE_DIALOG (dialog), - msg.c_str()); + "%s", msg.c_str()); ret = gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); if (ret == GTK_RESPONSE_YES) Modified: trunk/gtk/src/YGUI.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGUI.cc?rev=46752&r1=... ============================================================================== --- trunk/gtk/src/YGUI.cc (original) +++ trunk/gtk/src/YGUI.cc Wed Apr 16 17:22:39 2008 @@ -311,7 +311,7 @@ char *error = g_strdup_printf ( "Error: couldn't save y2logs: "%s" (exit value: %d)", command.c_str(), ret); - y2error (error); + y2error ("%s", error); errorMsg (error); g_free (error); } Modified: trunk/gtk/src/ygdkmngloader.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygdkmngloader.c?rev=46752... ============================================================================== --- trunk/gtk/src/ygdkmngloader.c (original) +++ trunk/gtk/src/ygdkmngloader.c Wed Apr 16 17:22:39 2008 @@ -243,7 +243,7 @@ if (chunk_size > 1) { // Read TERM chunk data - guint8 t; + guint8 t = 0; error = !read_uint8 (&data, &t); // term action if (t == 3 && chunk_size == 2+8) { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org