Author: pollux
Date: 2006-07-09 18:16:09 +0000 (Sun, 09 Jul 2006)
New Revision: 22331
Modified:
xfprint/trunk/libxfprint/printer-list-window.c
xfprint/trunk/libxfprint/printer-queue-window.c
xfprint/trunk/xfprint/print_dialog.c
Log:
uses GtkIconTheme instead of deprecated XfceIconTheme
Modified: xfprint/trunk/libxfprint/printer-list-window.c
===================================================================
--- xfprint/trunk/libxfprint/printer-list-window.c 2006-07-09 17:49:29 UTC
(rev 22330)
+++ xfprint/trunk/libxfprint/printer-list-window.c 2006-07-09 18:16:09 UTC
(rev 22331)
@@ -46,7 +46,7 @@
{
PrintingSystem *ps;
- XfceIconTheme *icontheme;
+ GtkIconTheme *icontheme;
GtkUIManager *ui_manager;
GtkWidget *treeview;
@@ -123,19 +123,13 @@
GtkListStore *store;
GtkCellRenderer *cell;
GtkTreeViewColumn *column;
- GdkPixbuf *icon = NULL;
priv = win->priv = PRINTER_LIST_WINDOW_GET_PRIVATE (win);
- priv->icontheme = xfce_icon_theme_get_for_screen (NULL);
+ priv->icontheme = gtk_icon_theme_get_default ();
g_signal_connect (G_OBJECT (priv->icontheme), "changed", G_CALLBACK
(icon_theme_changed_cb), win);
- icon = xfce_icon_theme_load (priv->icontheme, "xfprint", 48);
- if (icon) {
- gtk_window_set_icon (GTK_WINDOW (win), xfce_icon_theme_load
(priv->icontheme, "xfprint", 48));
- g_object_unref (icon);
- }
-
+ gtk_window_set_icon_name (GTK_WINDOW (win), "xfprint");
gtk_window_set_default_size (GTK_WINDOW (win), 450, 250);
gtk_window_set_title (GTK_WINDOW (win), _("Printer manager"));
@@ -270,7 +264,7 @@
xfce_about_info_add_credit (info, "Jean-Francois Wauthy", "[EMAIL
PROTECTED]", _("Maintainer"));
xfce_about_info_add_credit (info, "Francois Le Clainche", "[EMAIL
PROTECTED]", _("Artist"));
- icon = xfce_icon_theme_load (priv->icontheme, "xfprint", 48);
+ icon = gtk_icon_theme_load_icon (priv->icontheme, "xfprint", 48, 0, NULL);
dialog = xfce_about_dialog_new_with_values (GTK_WINDOW (win), info, icon);
@@ -321,9 +315,9 @@
continue;
}
if (printer->type == PRINTER_TYPE_CLASS)
- icon = xfce_icon_theme_load (priv->icontheme, "printer-class", x);
+ icon = gtk_icon_theme_load_icon (priv->icontheme, "printer-class", x, 0,
NULL);
if (!icon || printer->type == PRINTER_TYPE_PRINTER)
- icon = xfce_icon_theme_load (priv->icontheme, "gnome-dev-printer", x);
+ icon = gtk_icon_theme_load_icon (priv->icontheme, "gnome-dev-printer",
x, 0, NULL);
num_jobs = printing_system_get_jobs_count (priv->ps, printer->name);
num_jobs_str = g_strdup_printf ("%d", num_jobs);
@@ -384,12 +378,12 @@
g_object_unref (icon);
// FIXME
-// printer = printer_lookup_byname (printers_list, name);
+ //printer = printer_lookup_byname (printers_list, name);
if (printer->type == PRINTER_TYPE_CLASS)
- icon = xfce_icon_theme_load (priv->icontheme, "printer-class", 48);
+ icon = gtk_icon_theme_load_icon (priv->icontheme, "printer-class", 48, 0,
NULL);
if (!icon || printer->type == PRINTER_TYPE_PRINTER)
- icon = xfce_icon_theme_load (priv->icontheme, "gnome-dev-printer", 48);
+ icon = gtk_icon_theme_load_icon (priv->icontheme, "gnome-dev-printer", 48,
0, NULL);
gtk_list_store_set (GTK_LIST_STORE (model), iter, PRINTERS_ICON_COLUMN,
icon, -1);
Modified: xfprint/trunk/libxfprint/printer-queue-window.c
===================================================================
--- xfprint/trunk/libxfprint/printer-queue-window.c 2006-07-09 17:49:29 UTC
(rev 22330)
+++ xfprint/trunk/libxfprint/printer-queue-window.c 2006-07-09 18:16:09 UTC
(rev 22331)
@@ -39,7 +39,7 @@
PrintingSystem *ps;
gchar *printer;
- XfceIconTheme *icontheme;
+ GtkIconTheme *icontheme;
GtkUIManager *ui_manager;
GtkActionGroup *action_group;
@@ -112,19 +112,14 @@
GtkTreeSelection *selection;
GtkCellRenderer *cell;
GtkTreeViewColumn *column;
- GdkPixbuf *icon = NULL;
priv = win->priv = PRINTER_QUEUE_WINDOW_GET_PRIVATE (win);
- priv->icontheme = xfce_icon_theme_get_for_screen (NULL);
+ priv->icontheme = gtk_icon_theme_get_default ();
g_signal_connect (G_OBJECT (priv->icontheme), "changed", G_CALLBACK
(icon_theme_changed_cb), win);
gtk_window_set_title (GTK_WINDOW (win), _("Queue Manager"));
- icon = xfce_icon_theme_load (priv->icontheme, "xfprint", 48);
- if (icon) {
- gtk_window_set_icon (GTK_WINDOW (win), icon);
- g_object_unref (icon);
- }
+ gtk_window_set_icon_name (GTK_WINDOW (win), "xfprint");
gtk_window_set_default_size (GTK_WINDOW (win), 450, 150);
gtk_window_set_position (GTK_WINDOW (win), GTK_WIN_POS_NONE);
@@ -276,9 +271,9 @@
g_object_unref (icon);
if (gtk_icon_size_lookup (GTK_ICON_SIZE_LARGE_TOOLBAR, &x, &y))
- icon = xfce_icon_theme_load (priv->icontheme,
"gnome-mime-application-postscript", x);
+ icon = gtk_icon_theme_load_icon (priv->icontheme,
"gnome-mime-application-postscript", x, 0, NULL);
else
- icon = xfce_icon_theme_load (priv->icontheme,
"gnome-mime-application-postscript", 24);
+ icon = gtk_icon_theme_load_icon (priv->icontheme,
"gnome-mime-application-postscript", 24, 0, NULL);
gtk_list_store_set (GTK_LIST_STORE (model), iter, JOBS_ICON_COLUMN, icon,
-1);
g_object_unref (icon);
@@ -436,9 +431,9 @@
Job *job_data = (Job *) job->data;
if (gtk_icon_size_lookup (GTK_ICON_SIZE_LARGE_TOOLBAR, &x, &y))
- icon = xfce_icon_theme_load (priv->icontheme,
"gnome-mime-application-postscript", x);
+ icon = gtk_icon_theme_load_icon (priv->icontheme,
"gnome-mime-application-postscript", x, 0, NULL);
else
- icon = xfce_icon_theme_load (priv->icontheme,
"gnome-mime-application-postscript", 24);
+ icon = gtk_icon_theme_load_icon (priv->icontheme,
"gnome-mime-application-postscript", 24, 0, NULL);
string_id = g_strdup_printf ("%u", job_data->id);
switch (job_data->state) {
Modified: xfprint/trunk/xfprint/print_dialog.c
===================================================================
--- xfprint/trunk/xfprint/print_dialog.c 2006-07-09 17:49:29 UTC (rev
22330)
+++ xfprint/trunk/xfprint/print_dialog.c 2006-07-09 18:16:09 UTC (rev
22331)
@@ -69,7 +69,7 @@
struct PrintDialogPrivate
{
const gchar *input_file;
- XfceIconTheme *icontheme;
+ GtkIconTheme *icontheme;
XfprintSettings *settings;
GtkWidget *radiobutton_printto_backend;
@@ -187,20 +187,15 @@
GSList *group;
GtkListStore *store;
GtkCellRenderer *cell;
-
- GdkPixbuf *icon = NULL;
gchar *path;
dlg = obj->priv = PRINT_DIALOG_GET_PRIVATE (obj);
- dlg->icontheme = xfce_icon_theme_get_for_screen (NULL);
+ dlg->icontheme = gtk_icon_theme_get_default ();
- icon = xfce_icon_theme_load (dlg->icontheme, "xfprint", 48);
- if (icon) {
- gtk_window_set_icon (GTK_WINDOW (obj), icon);
- g_object_unref (icon);
- }
+ gtk_window_set_icon_name (GTK_WINDOW (obj), "xfprint");
+
button_save = xfce_create_mixed_button (GTK_STOCK_SAVE, _("Save settings"));
g_signal_connect (G_OBJECT (button_save), "clicked", G_CALLBACK
(button_save_clicked_cb), obj);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (obj)->action_area), button_save,
TRUE, TRUE, 0);
@@ -394,8 +389,8 @@
printer = printers = printing_system_get_printers (ps);
default_printer = printing_system_get_default_printer (ps);
- icon_printer = xfce_icon_theme_load (priv->icontheme, "gnome-dev-printer",
16);
- icon_class = xfce_icon_theme_load (priv->icontheme, "printer-class", 16);
+ icon_printer = gtk_icon_theme_load_icon (priv->icontheme,
"gnome-dev-printer", 16, 0, NULL);
+ icon_class = gtk_icon_theme_load_icon (priv->icontheme, "printer-class", 16,
0, NULL);
model = gtk_combo_box_get_model (GTK_COMBO_BOX (priv->combobox_printer));
gtk_list_store_clear (GTK_LIST_STORE (model));
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
