Author: pollux
Date: 2006-10-20 20:07:42 +0000 (Fri, 20 Oct 2006)
New Revision: 23487
Modified:
xfprint/trunk/libxfprint/printing-system.c
xfprint/trunk/xfprint/main.c
xfprint/trunk/xfprint/print_dialog.c
Log:
fix warnings
Modified: xfprint/trunk/libxfprint/printing-system.c
===================================================================
--- xfprint/trunk/libxfprint/printing-system.c 2006-10-20 13:44:54 UTC (rev
23486)
+++ xfprint/trunk/libxfprint/printing-system.c 2006-10-20 20:07:42 UTC (rev
23487)
@@ -273,7 +273,8 @@
GList *
printing_system_get_printers (PrintingSystem * ps)
{
- g_return_val_if_fail (ps, NULL);
+ if (ps == NULL)
+ return NULL;
return PRINTING_SYSTEM_GET_PRIVATE (ps)->ps_get_printers ();
}
@@ -281,7 +282,8 @@
Printer *
printing_system_get_default_printer (PrintingSystem * ps)
{
- g_return_val_if_fail (ps, NULL);
+ if (ps == NULL)
+ return NULL;
return PRINTING_SYSTEM_GET_PRIVATE (ps)->ps_get_default_printer ();
}
@@ -289,7 +291,8 @@
gint
printing_system_get_printer_state (PrintingSystem * ps, const gchar * printer)
{
- g_return_val_if_fail (ps, PRINTER_STATE_UNKNOWN);
+ if (ps == NULL)
+ return PRINTER_STATE_UNKNOWN;
return PRINTING_SYSTEM_GET_PRIVATE (ps)->ps_get_printer_state (printer);
}
@@ -297,7 +300,8 @@
gint
printing_system_get_jobs_count (PrintingSystem * ps, const gchar * printer)
{
- g_return_val_if_fail (ps, 0);
+ if (ps == NULL)
+ return 0;
return PRINTING_SYSTEM_GET_PRIVATE (ps)->ps_get_printer_jobs_count (printer);
}
@@ -305,7 +309,8 @@
gboolean
printing_system_remove_job (PrintingSystem * ps, const gchar * printer, gint
id)
{
- g_return_val_if_fail (ps, FALSE);
+ if (ps == NULL)
+ return FALSE;
return PRINTING_SYSTEM_GET_PRIVATE (ps)->ps_remove_job (printer, id);
}
@@ -313,7 +318,8 @@
GList *
printing_system_get_jobs (PrintingSystem * ps, const gchar * printer)
{
- g_return_val_if_fail (ps, NULL);
+ if (ps == NULL)
+ return NULL;
return PRINTING_SYSTEM_GET_PRIVATE (ps)->ps_get_jobs (printer);
}
@@ -321,7 +327,8 @@
gboolean
printing_system_print_file (PrintingSystem * ps, const gchar * printer, const
gchar * original_name, const gchar * file, gboolean remove_file)
{
- g_return_val_if_fail (ps, FALSE);
+ if (ps == NULL)
+ return FALSE;
return PRINTING_SYSTEM_GET_PRIVATE (ps)->ps_print_file (printer,
original_name, file, remove_file);
}
@@ -329,7 +336,8 @@
void
printing_system_customize_printer_list_window (PrintingSystem * ps,
PrinterListWindow * win)
{
- g_return_if_fail (ps);
+ if (ps == NULL)
+ return;
PRINTING_SYSTEM_GET_PRIVATE (ps)->ps_customize_printer_list_window (win);
}
@@ -337,7 +345,8 @@
void
printing_system_customize_printer_queue_window (PrintingSystem * ps,
PrinterQueueWindow * win)
{
- g_return_if_fail (ps);
+ if (ps == NULL)
+ return;
PRINTING_SYSTEM_GET_PRIVATE (ps)->ps_customize_printer_queue_window (win);
}
Modified: xfprint/trunk/xfprint/main.c
===================================================================
--- xfprint/trunk/xfprint/main.c 2006-10-20 13:44:54 UTC (rev 23486)
+++ xfprint/trunk/xfprint/main.c 2006-10-20 20:07:42 UTC (rev 23487)
@@ -52,20 +52,11 @@
Display *dpy;
int screen;
PrintingSystem *ps = NULL;
+
+ g_log_set_always_fatal (G_LOG_LEVEL_CRITICAL);
-#if 0
-#ifdef ENABLE_NLS
/* This is required for UTF-8 at least - Please don't remove it */
- bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
-#ifdef HAVE_BIND_TEXTDOMAIN_CODESET
- bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-#endif
- textdomain (GETTEXT_PACKAGE);
-#endif
-#else
- /* This is required for UTF-8 at least - Please don't remove it */
xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8");
-#endif
gtk_set_locale ();
gtk_init (&argc, &argv);
@@ -89,11 +80,17 @@
g_warning ("Unable to load printing system module %s",
setting->data.v_string);
}
mcs_setting_free (setting);
+ } else {
+ g_warning ("%s: XfPrint/system is not set", PACKAGE);
}
mcs_client_destroy (client);
+ } else {
+ g_warning ("%s: no mcs client found", PACKAGE);
}
+ if (ps == NULL)
+ g_warning ("%s: No printing system loaded", PACKAGE);
if (argc == 1) {
struct timeval tv;
Modified: xfprint/trunk/xfprint/print_dialog.c
===================================================================
--- xfprint/trunk/xfprint/print_dialog.c 2006-10-20 13:44:54 UTC (rev
23486)
+++ xfprint/trunk/xfprint/print_dialog.c 2006-10-20 20:07:42 UTC (rev
23487)
@@ -413,10 +413,12 @@
printer = g_list_next (printer);
}
+
+ if (G_LIKELY (G_IS_OBJECT (icon_printer)))
+ g_object_unref (icon_printer);
+ if (G_LIKELY (G_IS_OBJECT (icon_class)))
+ g_object_unref (icon_class);
- g_object_unref (icon_printer);
- g_object_unref (icon_class);
-
printers_free (printers);
}
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
