[Goodies-commits] r4692 - xfburn/trunk/xfburn
David Mohr
squisher at xfce.org
Thu May 1 04:35:36 CEST 2008
Author: squisher
Date: 2008-05-01 02:35:36 +0000 (Thu, 01 May 2008)
New Revision: 4692
Modified:
xfburn/trunk/xfburn/Makefile.am
xfburn/trunk/xfburn/xfburn-blank-dialog.c
xfburn/trunk/xfburn/xfburn-blank-dialog.h
xfburn/trunk/xfburn/xfburn-main-window.c
xfburn/trunk/xfburn/xfburn-welcome-tab.c
Log:
Reflecting the blank-dialog rename in the code
Modified: xfburn/trunk/xfburn/Makefile.am
===================================================================
--- xfburn/trunk/xfburn/Makefile.am 2008-05-01 01:45:45 UTC (rev 4691)
+++ xfburn/trunk/xfburn/Makefile.am 2008-05-01 02:35:36 UTC (rev 4692)
@@ -11,7 +11,7 @@
xfburn_headers = \
xfburn-global.h \
xfburn-adding-progress.h \
- xfburn-blank-cd-dialog.h \
+ xfburn-blank-dialog.h \
xfburn-perform-burn.h \
xfburn-burn-data-composition-base-dialog.h \
xfburn-burn-data-cd-composition-dialog.h \
@@ -44,7 +44,7 @@
xfburn_SOURCES = \
$(xfburn_headers) \
xfburn-adding-progress.c \
- xfburn-blank-cd-dialog.c \
+ xfburn-blank-dialog.c \
xfburn-perform-burn.c \
xfburn-burn-data-composition-base-dialog.c \
xfburn-burn-data-cd-composition-dialog.c \
Modified: xfburn/trunk/xfburn/xfburn-blank-dialog.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-blank-dialog.c 2008-05-01 01:45:45 UTC (rev 4691)
+++ xfburn/trunk/xfburn/xfburn-blank-dialog.c 2008-05-01 02:35:36 UTC (rev 4692)
@@ -31,9 +31,9 @@
#include "xfburn-device-box.h"
#include "xfburn-stock.h"
-#include "xfburn-blank-cd-dialog.h"
+#include "xfburn-blank-dialog.h"
-#define XFBURN_BLANK_CD_DIALOG_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), XFBURN_TYPE_BLANK_CD_DIALOG, XfburnBlankCdDialogPrivate))
+#define XFBURN_BLANK_DIALOG_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), XFBURN_TYPE_BLANK_DIALOG, XfburnBlankDialogPrivate))
typedef struct
{
@@ -41,51 +41,51 @@
GtkWidget *combo_type;
GtkWidget *check_eject;
-} XfburnBlankCdDialogPrivate;
+} XfburnBlankDialogPrivate;
-static void xfburn_blank_cd_dialog_class_init (XfburnBlankCdDialogClass * klass);
-static void xfburn_blank_cd_dialog_init (XfburnBlankCdDialog * sp);
+static void xfburn_blank_dialog_class_init (XfburnBlankDialogClass * klass);
+static void xfburn_blank_dialog_init (XfburnBlankDialog * sp);
-static void xfburn_blank_cd_dialog_response_cb (XfburnBlankCdDialog * dialog, gint response_id, gpointer user_data);
+static void xfburn_blank_dialog_response_cb (XfburnBlankDialog * dialog, gint response_id, gpointer user_data);
static XfceTitledDialogClass *parent_class = NULL;
GtkType
-xfburn_blank_cd_dialog_get_type ()
+xfburn_blank_dialog_get_type ()
{
static GtkType type = 0;
if (type == 0) {
static const GTypeInfo our_info = {
- sizeof (XfburnBlankCdDialogClass),
+ sizeof (XfburnBlankDialogClass),
NULL,
NULL,
- (GClassInitFunc) xfburn_blank_cd_dialog_class_init,
+ (GClassInitFunc) xfburn_blank_dialog_class_init,
NULL,
NULL,
- sizeof (XfburnBlankCdDialog),
+ sizeof (XfburnBlankDialog),
0,
- (GInstanceInitFunc) xfburn_blank_cd_dialog_init,
+ (GInstanceInitFunc) xfburn_blank_dialog_init,
};
- type = g_type_register_static (XFCE_TYPE_TITLED_DIALOG, "XfburnBlankCdDialog", &our_info, 0);
+ type = g_type_register_static (XFCE_TYPE_TITLED_DIALOG, "XfburnBlankDialog", &our_info, 0);
}
return type;
}
static void
-xfburn_blank_cd_dialog_class_init (XfburnBlankCdDialogClass * klass)
+xfburn_blank_dialog_class_init (XfburnBlankDialogClass * klass)
{
parent_class = g_type_class_peek_parent (klass);
- g_type_class_add_private (klass, sizeof (XfburnBlankCdDialogPrivate));
+ g_type_class_add_private (klass, sizeof (XfburnBlankDialogPrivate));
}
static void
-xfburn_blank_cd_dialog_init (XfburnBlankCdDialog * obj)
+xfburn_blank_dialog_init (XfburnBlankDialog * obj)
{
- XfburnBlankCdDialogPrivate *priv = XFBURN_BLANK_CD_DIALOG_GET_PRIVATE (obj);
+ XfburnBlankDialogPrivate *priv = XFBURN_BLANK_DIALOG_GET_PRIVATE (obj);
GtkBox *box = GTK_BOX (GTK_DIALOG (obj)->vbox);
GdkPixbuf *icon = NULL;
GtkWidget *frame;
@@ -143,7 +143,7 @@
gtk_widget_grab_focus (button);
gtk_widget_grab_default (button);
- g_signal_connect (G_OBJECT (obj), "response", G_CALLBACK (xfburn_blank_cd_dialog_response_cb), obj);
+ g_signal_connect (G_OBJECT (obj), "response", G_CALLBACK (xfburn_blank_dialog_response_cb), obj);
}
typedef struct {
@@ -230,10 +230,10 @@
}
static void
-xfburn_blank_cd_dialog_response_cb (XfburnBlankCdDialog * dialog, gint response_id, gpointer user_data)
+xfburn_blank_dialog_response_cb (XfburnBlankDialog * dialog, gint response_id, gpointer user_data)
{
if (response_id == GTK_RESPONSE_OK) {
- XfburnBlankCdDialogPrivate *priv = XFBURN_BLANK_CD_DIALOG_GET_PRIVATE (dialog);
+ XfburnBlankDialogPrivate *priv = XFBURN_BLANK_DIALOG_GET_PRIVATE (dialog);
XfburnDevice *device;
gint blank_type;
@@ -272,11 +272,11 @@
/* public */
GtkWidget *
-xfburn_blank_cd_dialog_new ()
+xfburn_blank_dialog_new ()
{
GtkWidget *obj;
- obj = GTK_WIDGET (g_object_new (XFBURN_TYPE_BLANK_CD_DIALOG, NULL));
+ obj = GTK_WIDGET (g_object_new (XFBURN_TYPE_BLANK_DIALOG, NULL));
return obj;
}
Modified: xfburn/trunk/xfburn/xfburn-blank-dialog.h
===================================================================
--- xfburn/trunk/xfburn/xfburn-blank-dialog.h 2008-05-01 01:45:45 UTC (rev 4691)
+++ xfburn/trunk/xfburn/xfburn-blank-dialog.h 2008-05-01 02:35:36 UTC (rev 4692)
@@ -17,8 +17,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#ifndef __XFBURN_BLANK_CD_DIALOG_H__
-#define __XFBURN_BLANK_CD_DIALOG_H__
+#ifndef __XFBURN_BLANK_DIALOG_H__
+#define __XFBURN_BLANK_DIALOG_H__
#ifdef HAVE_CONFIG_H
#include <config.h>
@@ -30,25 +30,25 @@
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))
-#define XFBURN_IS_BLANK_CD_DIALOG(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), XFBURN_TYPE_BLANK_CD_DIALOG))
-#define XFBURN_IS_BLANK_CD_DIALOG_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), XFBURN_TYPE_BLANK_CD_DIALOG))
-#define XFBURN_BLANK_CD_DIALOG_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), XFBURN_TYPE_BLANK_CD_DIALOG, XfburnBlankCdDialogClass))
+#define XFBURN_TYPE_BLANK_DIALOG (xfburn_blank_dialog_get_type ())
+#define XFBURN_BLANK_DIALOG(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), XFBURN_TYPE_BLANK_DIALOG, XfburnBlankDialog))
+#define XFBURN_BLANK_DIALOG_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), XFBURN_TYPE_BLANK_DIALOG, XfburnBlankDialogClass))
+#define XFBURN_IS_BLANK_DIALOG(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), XFBURN_TYPE_BLANK_DIALOG))
+#define XFBURN_IS_BLANK_DIALOG_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), XFBURN_TYPE_BLANK_DIALOG))
+#define XFBURN_BLANK_DIALOG_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), XFBURN_TYPE_BLANK_DIALOG, XfburnBlankDialogClass))
typedef struct
{
XfceTitledDialog parent;
-} XfburnBlankCdDialog;
+} XfburnBlankDialog;
typedef struct
{
XfceTitledDialogClass parent_class;
-} XfburnBlankCdDialogClass;
+} XfburnBlankDialogClass;
-GtkType xfburn_blank_cd_dialog_get_type ();
-GtkWidget *xfburn_blank_cd_dialog_new ();
+GtkType xfburn_blank_dialog_get_type ();
+GtkWidget *xfburn_blank_dialog_new ();
G_END_DECLS
-#endif /* XFBURN_BLANK_CD_H */
+#endif /* XFBURN_BLANK_DIALOG_H */
Modified: xfburn/trunk/xfburn/xfburn-main-window.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-main-window.c 2008-05-01 01:45:45 UTC (rev 4691)
+++ xfburn/trunk/xfburn/xfburn-main-window.c 2008-05-01 02:35:36 UTC (rev 4692)
@@ -32,7 +32,7 @@
#include "xfburn-preferences-dialog.h"
#include "xfburn-file-browser.h"
#include "xfburn-compositions-notebook.h"
-#include "xfburn-blank-cd-dialog.h"
+#include "xfburn-blank-dialog.h"
#include "xfburn-format-dvd-dialog.h"
#include "xfburn-copy-cd-dialog.h"
#include "xfburn-copy-dvd-dialog.h"
@@ -81,7 +81,7 @@
static void action_close (GtkAction *, XfburnMainWindow *);
static void action_quit (GtkAction *, XfburnMainWindow *);
-static void action_blank_cd (GtkAction *, XfburnMainWindow *);
+static void action_blank (GtkAction *, XfburnMainWindow *);
static void action_copy_cd (GtkAction *, XfburnMainWindow *);
static void action_burn_image (GtkAction *, XfburnMainWindow *);
@@ -124,7 +124,7 @@
{"about", GTK_STOCK_ABOUT, N_("_About"), NULL, N_("Display information about Xfburn"),
G_CALLBACK (action_about),},
{"blank-cd", "xfburn-blank-cdrw", N_("Blank CD-RW"), NULL, N_("Blank CD-RW"),
- G_CALLBACK (action_blank_cd),},
+ G_CALLBACK (action_blank),},
{"copy-data", "xfburn-data-copy", N_("Copy Data CD"), NULL, N_("Copy Data CD"),
G_CALLBACK (action_copy_cd),},
{"copy-audio", "xfburn-audio-copy", N_("Copy Audio CD"), NULL, N_("Copy Audio CD"),},
@@ -373,11 +373,11 @@
/* actions */
static void
-action_blank_cd (GtkAction * action, XfburnMainWindow * window)
+action_blank (GtkAction * action, XfburnMainWindow * window)
{
GtkWidget *dialog;
- dialog = xfburn_blank_cd_dialog_new ();
+ dialog = xfburn_blank_dialog_new ();
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (window));
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
Modified: xfburn/trunk/xfburn/xfburn-welcome-tab.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-welcome-tab.c 2008-05-01 01:45:45 UTC (rev 4691)
+++ xfburn/trunk/xfburn/xfburn-welcome-tab.c 2008-05-01 02:35:36 UTC (rev 4692)
@@ -37,7 +37,7 @@
#include "xfburn-main-window.h"
#include "xfburn-compositions-notebook.h"
#include "xfburn-burn-image-dialog.h"
-#include "xfburn-blank-cd-dialog.h"
+#include "xfburn-blank-dialog.h"
/* prototypes */
static void xfburn_welcome_tab_class_init (XfburnWelcomeTabClass * klass);
@@ -308,7 +308,7 @@
XfburnWelcomeTabPrivate *priv = XFBURN_WELCOME_TAB_GET_PRIVATE (tab);
GtkWidget *dialog;
- dialog = xfburn_blank_cd_dialog_new ();
+ dialog = xfburn_blank_dialog_new ();
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (priv->mainwin));
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
More information about the Goodies-commits
mailing list