AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-09 12:10:09 +00:00
Code Issues Projects Releases Wiki Activity

Move some variable declarations into the scopes in which they're used.

Browse Source
This commit is contained in:
John Ralls 2012-02-25 17:52:46 -08:00
parent b7d59f73db
commit 7d2725e400
1 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
modules/printbackends/cups/gtkprintbackendcups.c
View File

@ -2025,10 +2025,6 @@ cups_request_printer_list_cb (GtkPrintBackendCups *cups_backend,
gboolean status_changed = FALSE;
GList *node;
gint i;
gchar *reason_msg_desc = NULL;
gchar *tmp_msg = NULL;
gchar *tmp_msg2 = NULL;
gboolean found = FALSE;
PrinterSetupInfo *info = g_slice_new0 (PrinterSetupInfo);
/* Skip leading attributes until we hit a printer...
@ -2126,6 +2122,7 @@ cups_request_printer_list_cb (GtkPrintBackendCups *cups_backend,
if (info->state_msg != NULL && strlen (info->state_msg) == 0)
{
gchar *tmp_msg2 = NULL;
if (info->is_paused && !info->is_accepting_jobs)
/* Translators: this is a printer status. */
tmp_msg2 = g_strdup ( N_("Paused ; Rejecting Jobs"));
@ -2137,12 +2134,18 @@ cups_request_printer_list_cb (GtkPrintBackendCups *cups_backend,
tmp_msg2 = g_strdup ( N_("Rejecting Jobs"));
if (tmp_msg2 != NULL)
{
info->state_msg = tmp_msg2;
g_free (tmp_msg2);
}
}
/* Set description of the reason and combine it with printer-state-message. */
if ( (info->reason_msg != NULL))
{
gchar *reason_msg_desc = NULL;
gboolean found = FALSE;
for (i = 0; i < G_N_ELEMENTS (printer_messages); i++)
{
if (strncmp (info->reason_msg, printer_messages[i],
@ -2164,23 +2167,21 @@ cups_request_printer_list_cb (GtkPrintBackendCups *cups_backend,
info->state_msg = reason_msg_desc;
else
{
tmp_msg = g_strjoin (" ; ", info->state_msg, reason_msg_desc, NULL);
gchar *tmp_msg = NULL;
tmp_msg = g_strjoin (" ; ", info->state_msg,
reason_msg_desc, NULL);
info->state_msg = tmp_msg;
g_free (tmp_msg);
}
}
if (reason_msg_desc != NULL)
g_free (reason_msg_desc);
}
status_changed |= gtk_printer_set_state_message (printer, info->state_msg);
status_changed |= gtk_printer_set_is_accepting_jobs (printer, info->is_accepting_jobs);
if (tmp_msg != NULL)
g_free (tmp_msg);
if (tmp_msg2 != NULL)
g_free (tmp_msg2);
if (reason_msg_desc != NULL)
g_free (reason_msg_desc);
/* Set printer icon according to importance
(none, report, warning, error - report is omitted). */