Author: pollux
Date: 2006-07-07 19:22:23 +0000 (Fri, 07 Jul 2006)
New Revision: 22289
Modified:
xfburn/trunk/xfburn/xfburn-blank-cd-dialog.c
xfburn/trunk/xfburn/xfburn-blank-cd-dialog.h
xfburn/trunk/xfburn/xfburn-burn-composition-dialog.c
xfburn/trunk/xfburn/xfburn-burn-composition-dialog.h
xfburn/trunk/xfburn/xfburn-burn-image-dialog.c
xfburn/trunk/xfburn/xfburn-burn-image-dialog.h
xfburn/trunk/xfburn/xfburn-copy-cd-dialog.c
xfburn/trunk/xfburn/xfburn-copy-cd-dialog.h
xfburn/trunk/xfburn/xfburn-disc-content.c
Log:
* fix another crash in thunar_vfs_shutdown (some forgotten unref's)
* dialogs now derive XfceTitledDialog instead of using a XfceHeading
widget explicitly
Modified: xfburn/trunk/xfburn/xfburn-blank-cd-dialog.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-blank-cd-dialog.c 2006-07-07 07:13:00 UTC
(rev 22288)
+++ xfburn/trunk/xfburn/xfburn-blank-cd-dialog.c 2006-07-07 19:22:23 UTC
(rev 22289)
@@ -44,7 +44,7 @@
GtkWidget *check_eject;
};
-static GtkDialogClass *parent_class = NULL;
+static XfceTitledDialogClass *parent_class = NULL;
GtkType
xfburn_blank_cd_dialog_get_type ()
@@ -64,7 +64,7 @@
(GInstanceInitFunc) xfburn_blank_cd_dialog_init,
};
- type = g_type_register_static (GTK_TYPE_DIALOG, "XfburnBlankCdDialog",
&our_info, 0);
+ type = g_type_register_static (XFCE_TYPE_TITLED_DIALOG,
"XfburnBlankCdDialog", &our_info, 0);
}
return type;
@@ -88,7 +88,6 @@
GList *device;
GtkWidget *img;
GdkPixbuf *icon = NULL;
- GtkWidget *heading;
GtkWidget *frame;
GtkWidget *vbox;
GtkWidget *hbox;
@@ -103,14 +102,10 @@
gtk_window_set_title (GTK_WINDOW (obj), _("Blank CD-RW"));
gtk_window_set_destroy_with_parent (GTK_WINDOW (obj), TRUE);
- heading = xfce_heading_new ();
- xfce_heading_set_title (XFCE_HEADING (heading), _("Blank CD-RW"));
- icon = gtk_widget_render_icon (heading, XFBURN_STOCK_BLANK_CDRW,
GTK_ICON_SIZE_DIALOG, NULL);
- xfce_heading_set_icon (XFCE_HEADING (heading), icon);
+ icon = gtk_widget_render_icon (GTK_WIDGET (obj), XFBURN_STOCK_BLANK_CDRW,
GTK_ICON_SIZE_DIALOG, NULL);
+ gtk_window_set_icon (GTK_WINDOW (obj), icon);
g_object_unref (icon);
- gtk_widget_show (heading);
- gtk_box_pack_start (box, heading, FALSE, FALSE, 0);
-
+
vbox = gtk_vbox_new (FALSE, 0);
gtk_widget_show (vbox);
Modified: xfburn/trunk/xfburn/xfburn-blank-cd-dialog.h
===================================================================
--- xfburn/trunk/xfburn/xfburn-blank-cd-dialog.h 2006-07-07 07:13:00 UTC
(rev 22288)
+++ xfburn/trunk/xfburn/xfburn-blank-cd-dialog.h 2006-07-07 19:22:23 UTC
(rev 22289)
@@ -27,6 +27,7 @@
#include <gtk/gtk.h>
G_BEGIN_DECLS
+
#define XFBURN_TYPE_BLANK_CD_DIALOG (xfburn_blank_cd_dialog_get_type
())
#define XFBURN_BLANK_CD_DIALOG(o) (G_TYPE_CHECK_INSTANCE_CAST ((o),
XFBURN_TYPE_BLANK_CD_DIALOG, XfburnBlankCdDialog))
#define XFBURN_BLANK_CD_DIALOG_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k),
XFBURN_TYPE_BLANK_CD_DIALOG, XfburnBlankCdDialogClass))
@@ -37,16 +38,17 @@
typedef struct
{
- GtkDialog parent;
+ XfceTitledDialog parent;
XfburnBlankCdDialogPrivate *priv;
} XfburnBlankCdDialog;
typedef struct
{
- GtkDialogClass parent_class;
+ XfceTitledDialogClass parent_class;
} XfburnBlankCdDialogClass;
GtkType xfburn_blank_cd_dialog_get_type ();
GtkWidget *xfburn_blank_cd_dialog_new ();
+G_END_DECLS
#endif /* XFBURN_BLANK_CD_H */
Modified: xfburn/trunk/xfburn/xfburn-burn-composition-dialog.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-burn-composition-dialog.c 2006-07-07
07:13:00 UTC (rev 22288)
+++ xfburn/trunk/xfburn/xfburn-burn-composition-dialog.c 2006-07-07
19:22:23 UTC (rev 22289)
@@ -60,7 +60,7 @@
};
/* globals */
-static GtkDialogClass *parent_class = NULL;
+static XfceTitledDialogClass *parent_class = NULL;
GtkType
xfburn_burn_composition_dialog_get_type ()
@@ -80,7 +80,7 @@
(GInstanceInitFunc) xfburn_burn_composition_dialog_init,
};
- type = g_type_register_static (GTK_TYPE_DIALOG,
"XfburnBurnCompositionDialog", &our_info, 0);
+ type = g_type_register_static (XFCE_TYPE_TITLED_DIALOG,
"XfburnBurnCompositionDialog", &our_info, 0);
}
return type;
@@ -103,7 +103,6 @@
GtkBox *box = GTK_BOX (GTK_DIALOG (obj)->vbox);
GList *device;
GtkWidget *img;
- GtkWidget *heading;
GtkWidget *frame;
GtkWidget *vbox;
GtkWidget *hbox;
@@ -122,12 +121,7 @@
gtk_window_set_title (GTK_WINDOW (obj), _("Burn Composition"));
gtk_window_set_destroy_with_parent (GTK_WINDOW (obj), TRUE);
-
- heading = xfce_heading_new ();
- xfce_heading_set_title (XFCE_HEADING (heading), _("Burn Composition"));
- xfce_heading_set_icon_name (XFCE_HEADING (heading), GTK_STOCK_CDROM);
- gtk_widget_show (heading);
- gtk_box_pack_start (box, heading, FALSE, FALSE, 0);
+ gtk_window_set_icon_name (GTK_WINDOW (obj), GTK_STOCK_CDROM);
/* burning devices list */
vbox = gtk_vbox_new (FALSE, 0);
Modified: xfburn/trunk/xfburn/xfburn-burn-composition-dialog.h
===================================================================
--- xfburn/trunk/xfburn/xfburn-burn-composition-dialog.h 2006-07-07
07:13:00 UTC (rev 22288)
+++ xfburn/trunk/xfburn/xfburn-burn-composition-dialog.h 2006-07-07
19:22:23 UTC (rev 22289)
@@ -27,6 +27,7 @@
#include <gtk/gtk.h>
G_BEGIN_DECLS
+
#define XFBURN_TYPE_BURN_COMPOSITION_DIALOG
(xfburn_burn_composition_dialog_get_type ())
#define XFBURN_BURN_COMPOSITION_DIALOG(o)
(G_TYPE_CHECK_INSTANCE_CAST ((o), XFBURN_TYPE_BURN_COMPOSITION_DIALOG,
XfburnBurnCompositionDialog))
#define XFBURN_BURN_COMPOSITION_DIALOG_CLASS(k)
(G_TYPE_CHECK_CLASS_CAST((k), XFBURN_TYPE_BURN_COMPOSITION_DIALOG,
XfburnBurnCompositionDialogClass))
@@ -37,13 +38,13 @@
typedef struct
{
- GtkDialog parent;
+ XfceTitledDialog parent;
XfburnBurnCompositionDialogPrivate *priv;
} XfburnBurnCompositionDialog;
typedef struct
{
- GtkDialogClass parent_class;
+ XfceTitledDialogClass parent_class;
} XfburnBurnCompositionDialogClass;
GtkType xfburn_burn_composition_dialog_get_type ();
@@ -52,4 +53,5 @@
gchar *xfburn_burn_composition_dialog_get_command_iso
(XfburnBurnCompositionDialog *dialog);
gchar *xfburn_burn_composition_dialog_get_command_burn
(XfburnBurnCompositionDialog *dialog);
+G_END_DECLS
#endif /* XFBURN_BURN_COMPOSITION_DIALOG_H */
Modified: xfburn/trunk/xfburn/xfburn-burn-image-dialog.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-burn-image-dialog.c 2006-07-07 07:13:00 UTC
(rev 22288)
+++ xfburn/trunk/xfburn/xfburn-burn-image-dialog.c 2006-07-07 19:22:23 UTC
(rev 22289)
@@ -50,7 +50,7 @@
GtkWidget *check_dummy;
};
-static GtkDialogClass *parent_class = NULL;
+static XfceTitledDialogClass *parent_class = NULL;
GtkType
xfburn_burn_image_dialog_get_type ()
@@ -70,7 +70,7 @@
(GInstanceInitFunc) xfburn_burn_image_dialog_init,
};
- type = g_type_register_static (GTK_TYPE_DIALOG, "XfburnBurnImageDialog",
&our_info, 0);
+ type = g_type_register_static (XFCE_TYPE_TITLED_DIALOG,
"XfburnBurnImageDialog", &our_info, 0);
}
return type;
@@ -93,7 +93,6 @@
XfburnBurnImageDialogPrivate *priv;
GList *device;
GtkWidget *img;
- GtkWidget *heading;
GdkPixbuf *icon = NULL;
GtkWidget *frame;
GtkWidget *vbox;
@@ -107,15 +106,11 @@
priv = obj->priv;
gtk_window_set_title (GTK_WINDOW (obj), _("Burn CD image"));
-
- heading = xfce_heading_new ();
- xfce_heading_set_title (XFCE_HEADING (heading), _("Burn CD image"));
- icon = gtk_widget_render_icon (heading, XFBURN_STOCK_BURN_CD,
GTK_ICON_SIZE_DIALOG, NULL);
- xfce_heading_set_icon (XFCE_HEADING (heading), icon);
+ gtk_window_set_destroy_with_parent (GTK_WINDOW (obj), TRUE);
+ icon = gtk_widget_render_icon (GTK_WIDGET (obj), XFBURN_STOCK_BURN_CD,
GTK_ICON_SIZE_DIALOG, NULL);
+ gtk_window_set_icon (GTK_WINDOW (obj), icon);
g_object_unref (icon);
- gtk_widget_show (heading);
- gtk_box_pack_start (box, heading, FALSE, FALSE, 0);
-
+
/* file */
priv->chooser_image = gtk_file_chooser_button_new (_("Image to burn"),
GTK_FILE_CHOOSER_ACTION_OPEN);
gtk_widget_show (priv->chooser_image);
Modified: xfburn/trunk/xfburn/xfburn-burn-image-dialog.h
===================================================================
--- xfburn/trunk/xfburn/xfburn-burn-image-dialog.h 2006-07-07 07:13:00 UTC
(rev 22288)
+++ xfburn/trunk/xfburn/xfburn-burn-image-dialog.h 2006-07-07 19:22:23 UTC
(rev 22289)
@@ -29,6 +29,7 @@
#include "xfburn-global.h"
G_BEGIN_DECLS
+
#define XFBURN_TYPE_BURN_IMAGE_DIALOG
(xfburn_burn_image_dialog_get_type ())
#define XFBURN_BURN_IMAGE_DIALOG(o) (G_TYPE_CHECK_INSTANCE_CAST
((o), XFBURN_TYPE_BURN_IMAGE_DIALOG, XfburnBurnImageDialog))
#define XFBURN_BURN_IMAGE_DIALOG_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k),
XFBURN_TYPE_BURN_IMAGE_DIALOG, XfburnBurnImageDialogClass))
@@ -39,16 +40,18 @@
typedef struct
{
- GtkDialog parent;
+ XfceTitledDialog parent;
XfburnBurnImageDialogPrivate *priv;
} XfburnBurnImageDialog;
typedef struct
{
- GtkDialogClass parent_class;
+ XfceTitledDialogClass parent_class;
} XfburnBurnImageDialogClass;
GtkType xfburn_burn_image_dialog_get_type ();
GtkWidget *xfburn_burn_image_dialog_new ();
+G_END_DECLS
+
#endif /* XFBURN_BURN_IMAGE_DIALOG_H */
Modified: xfburn/trunk/xfburn/xfburn-copy-cd-dialog.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-copy-cd-dialog.c 2006-07-07 07:13:00 UTC (rev
22288)
+++ xfburn/trunk/xfburn/xfburn-copy-cd-dialog.c 2006-07-07 19:22:23 UTC (rev
22289)
@@ -61,7 +61,7 @@
};
/* globals */
-static GtkDialogClass *parent_class = NULL;
+static XfceTitledDialogClass *parent_class = NULL;
GtkType
xfburn_copy_cd_dialog_get_type ()
@@ -81,7 +81,7 @@
(GInstanceInitFunc) xfburn_copy_cd_dialog_init,
};
- type = g_type_register_static (GTK_TYPE_DIALOG, "XfburnCopyCdDialog",
&our_info, 0);
+ type = g_type_register_static (XFCE_TYPE_TITLED_DIALOG,
"XfburnCopyCdDialog", &our_info, 0);
}
return type;
@@ -104,7 +104,6 @@
GtkBox *box = GTK_BOX (GTK_DIALOG (obj)->vbox);
GList *device;
GtkWidget *img;
- GtkWidget *heading;
GdkPixbuf *icon = NULL;
GtkWidget *frame;
GtkWidget *vbox;
@@ -119,14 +118,10 @@
priv = obj->priv;
gtk_window_set_title (GTK_WINDOW (obj), _("Copy data CD"));
-
- heading = xfce_heading_new ();
- xfce_heading_set_title (XFCE_HEADING (heading), _("Burn CD image"));
- icon = gtk_widget_render_icon (heading, XFBURN_STOCK_DATA_COPY,
GTK_ICON_SIZE_DIALOG, NULL);
- xfce_heading_set_icon (XFCE_HEADING (heading), icon);
+ gtk_window_set_destroy_with_parent (GTK_WINDOW (obj), TRUE);
+ icon = gtk_widget_render_icon (GTK_WIDGET (obj), XFBURN_STOCK_DATA_COPY,
GTK_ICON_SIZE_DIALOG, NULL);
+ gtk_window_set_icon (GTK_WINDOW (obj), icon);
g_object_unref (icon);
- gtk_widget_show (heading);
- gtk_box_pack_start (box, heading, FALSE, FALSE, 0);
/* reader devices list */
vbox = gtk_vbox_new (FALSE, 0);
Modified: xfburn/trunk/xfburn/xfburn-copy-cd-dialog.h
===================================================================
--- xfburn/trunk/xfburn/xfburn-copy-cd-dialog.h 2006-07-07 07:13:00 UTC (rev
22288)
+++ xfburn/trunk/xfburn/xfburn-copy-cd-dialog.h 2006-07-07 19:22:23 UTC (rev
22289)
@@ -37,13 +37,13 @@
typedef struct
{
- GtkDialog parent;
+ XfceTitledDialog parent;
XfburnCopyCdDialogPrivate *priv;
} XfburnCopyCdDialog;
typedef struct
{
- GtkDialogClass parent_class;
+ XfceTitledDialogClass parent_class;
} XfburnCopyCdDialogClass;
GtkType xfburn_copy_cd_dialog_get_type ();
Modified: xfburn/trunk/xfburn/xfburn-disc-content.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-disc-content.c 2006-07-07 07:13:00 UTC (rev
22288)
+++ xfburn/trunk/xfburn/xfburn-disc-content.c 2006-07-07 19:22:23 UTC (rev
22289)
@@ -197,7 +197,7 @@
};
/* initialize static members */
- gtk_icon_size_lookup (GTK_ICON_SIZE_BUTTON, &x, &y);
+ gtk_icon_size_lookup (GTK_ICON_SIZE_SMALL_TOOLBAR, &x, &y);
if (!icon_directory)
icon_directory = xfce_themed_icon_load ("gnome-fs-directory", x);
if (!icon_file)
@@ -674,6 +674,7 @@
ThunarVfsMimeInfo *mime_info = NULL;
const gchar *mime_icon_name = NULL;
GdkPixbuf *mime_icon = NULL;
+ gint x,y;
screen = gtk_widget_get_screen (GTK_WIDGET (dc));
icon_theme = gtk_icon_theme_get_for_screen (screen);
@@ -681,8 +682,9 @@
mime_database = thunar_vfs_mime_database_get_default ();
mime_info = thunar_vfs_mime_database_get_info_for_file
(mime_database, path, NULL);
+ gtk_icon_size_lookup (GTK_ICON_SIZE_SMALL_TOOLBAR, &x, &y);
mime_icon_name = thunar_vfs_mime_info_lookup_icon_name (mime_info,
icon_theme);
- mime_icon = gtk_icon_theme_load_icon (icon_theme, mime_icon_name, 24,
0, NULL);
+ mime_icon = gtk_icon_theme_load_icon (icon_theme, mime_icon_name, x,
0, NULL);
#endif
gtk_tree_store_append (GTK_TREE_STORE (model), iter, parent);
@@ -696,6 +698,12 @@
DISC_CONTENT_COLUMN_TYPE, DISC_CONTENT_TYPE_FILE,
-1);
xfburn_disc_usage_add_size (XFBURN_DISC_USAGE (dc->priv->disc_usage),
s.st_size);
+#ifdef HAVE_THUNAR_VFS
+ if (G_LIKELY (G_IS_OBJECT (mime_icon)))
+ g_object_unref (mime_icon);
+ thunar_vfs_mime_info_unref (mime_info);
+ g_object_unref (mime_database);
+#endif
}
g_free (humansize);
g_free (parent);
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
