GNOME.org
 

[gthumb: 7/22] [picasaweb] changed the prefix from gth_ to picasa_

commit 153f81685f7958c2afde19b9bec429868cafd11b
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Mon Jan 25 12:26:12 2010 +0100

    [picasaweb] changed the prefix from gth_ to picasa_

 extensions/picasaweb/Makefile.am                   |   40 +++++++-------
 extensions/picasaweb/dlg-export-to-picasaweb.c     |   32 +++++-----
 extensions/picasaweb/gth-account-chooser-dialog.h  |   59 -------------------
 .../picasaweb/gth-account-properties-dialog.h      |   61 --------------------
 extensions/picasaweb/gth-album-properties-dialog.h |   60 -------------------
 ...er-dialog.c => picasa-account-chooser-dialog.c} |   48 ++++++++--------
 .../picasaweb/picasa-account-chooser-dialog.h      |   59 +++++++++++++++++++
 ...dialog.c => picasa-account-properties-dialog.c} |   60 ++++++++++----------
 .../picasaweb/picasa-account-properties-dialog.h   |   61 ++++++++++++++++++++
 ...s-dialog.c => picasa-album-properties-dialog.c} |   46 +++++++-------
 .../picasaweb/picasa-album-properties-dialog.h     |   60 +++++++++++++++++++
 11 files changed, 293 insertions(+), 293 deletions(-)
---
diff --git a/extensions/picasaweb/Makefile.am b/extensions/picasaweb/Makefile.am
index cd636c1..bfcb499 100644
--- a/extensions/picasaweb/Makefile.am
+++ b/extensions/picasaweb/Makefile.am
@@ -5,26 +5,26 @@ SUBDIRS = data
 extensiondir = $(pkglibdir)/extensions
 extension_LTLIBRARIES = libpicasaweb.la
 
-libpicasaweb_la_SOURCES = 		\
-	actions.c			\
-	actions.h			\
-	callbacks.c			\
-	callbacks.h			\
-	dlg-export-to-picasaweb.c	\
-	dlg-export-to-picasaweb.h	\
-	google-connection.c		\
-	google-connection.h		\
-	gth-account-chooser-dialog.c	\
-	gth-account-chooser-dialog.h	\
-	gth-account-properties-dialog.c	\
-	gth-account-properties-dialog.h	\
-	gth-album-properties-dialog.c	\
-	gth-album-properties-dialog.h	\
-	main.c				\
-	picasa-web-album.c		\
-	picasa-web-album.h		\
-	picasa-web-service.c		\
-	picasa-web-service.h		\
+libpicasaweb_la_SOURCES = 			\
+	actions.c				\
+	actions.h				\
+	callbacks.c				\
+	callbacks.h				\
+	dlg-export-to-picasaweb.c		\
+	dlg-export-to-picasaweb.h		\
+	google-connection.c			\
+	google-connection.h			\
+	main.c					\
+	picasa-account-chooser-dialog.c		\
+	picasa-account-chooser-dialog.h		\
+	picasa-account-properties-dialog.c	\
+	picasa-account-properties-dialog.h	\
+	picasa-album-properties-dialog.c	\
+	picasa-album-properties-dialog.h	\
+	picasa-web-album.c			\
+	picasa-web-album.h			\
+	picasa-web-service.c			\
+	picasa-web-service.h			\
 	preferences.h
 
 libpicasaweb_la_CFLAGS = $(GTHUMB_CFLAGS) $(LIBSOUP_CFLAGS) $(GNOME_KEYRING_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb 
diff --git a/extensions/picasaweb/dlg-export-to-picasaweb.c b/extensions/picasaweb/dlg-export-to-picasaweb.c
index 3e65952..a355258 100644
--- a/extensions/picasaweb/dlg-export-to-picasaweb.c
+++ b/extensions/picasaweb/dlg-export-to-picasaweb.c
@@ -27,9 +27,9 @@
 #endif /* HAVE_GNOME_KEYRING */
 #include <gthumb.h>
 #include "dlg-export-to-picasaweb.h"
-#include "gth-account-chooser-dialog.h"
-#include "gth-account-properties-dialog.h"
-#include "gth-album-properties-dialog.h"
+#include "picasa-account-chooser-dialog.h"
+#include "picasa-account-properties-dialog.h"
+#include "picasa-album-properties-dialog.h"
 #include "picasa-web-album.h"
 #include "picasa-web-service.h"
 
@@ -350,9 +350,9 @@ challange_account_dialog_response_cb (GtkDialog *dialog,
 	case GTK_RESPONSE_OK:
 		g_free (data->email);
 		g_free (data->password);
-		data->email = g_strdup (gth_account_properties_dialog_get_email (GTH_ACCOUNT_PROPERTIES_DIALOG (dialog)));
-		data->password = g_strdup (gth_account_properties_dialog_get_password (GTH_ACCOUNT_PROPERTIES_DIALOG (dialog)));
-		data->challange = g_strdup (gth_account_properties_dialog_get_challange (GTH_ACCOUNT_PROPERTIES_DIALOG (dialog)));
+		data->email = g_strdup (picasa_account_properties_dialog_get_email (PICASA_ACCOUNT_PROPERTIES_DIALOG (dialog)));
+		data->password = g_strdup (picasa_account_properties_dialog_get_password (PICASA_ACCOUNT_PROPERTIES_DIALOG (dialog)));
+		data->challange = g_strdup (picasa_account_properties_dialog_get_challange (PICASA_ACCOUNT_PROPERTIES_DIALOG (dialog)));
 		gtk_widget_destroy (GTK_WIDGET (dialog));
 		connect_to_server (data);
 		break;
@@ -368,7 +368,7 @@ challange_account_dialog (DialogData *data)
 {
 	GtkWidget *dialog;
 
-	dialog = gth_account_properties_dialog_new (data->email, data->password, google_connection_get_challange_url (data->conn));
+	dialog = picasa_account_properties_dialog_new (data->email, data->password, google_connection_get_challange_url (data->conn));
 	g_signal_connect (dialog,
 			  "response",
 			  G_CALLBACK (challange_account_dialog_response_cb),
@@ -402,8 +402,8 @@ new_account_dialog_response_cb (GtkDialog *dialog,
 		g_free (data->email);
 		g_free (data->password);
 		g_free (data->challange);
-		data->email = g_strdup (gth_account_properties_dialog_get_email (GTH_ACCOUNT_PROPERTIES_DIALOG (dialog)));
-		data->password = g_strdup (gth_account_properties_dialog_get_password (GTH_ACCOUNT_PROPERTIES_DIALOG (dialog)));
+		data->email = g_strdup (picasa_account_properties_dialog_get_email (PICASA_ACCOUNT_PROPERTIES_DIALOG (dialog)));
+		data->password = g_strdup (picasa_account_properties_dialog_get_password (PICASA_ACCOUNT_PROPERTIES_DIALOG (dialog)));
 		data->challange = NULL;
 		gtk_widget_destroy (GTK_WIDGET (dialog));
 		connect_to_server (data);
@@ -420,7 +420,7 @@ new_account_dialog (DialogData *data)
 {
 	GtkWidget *dialog;
 
-	dialog = gth_account_properties_dialog_new (NULL, NULL, NULL);
+	dialog = picasa_account_properties_dialog_new (NULL, NULL, NULL);
 	g_signal_connect (dialog,
 			  "response",
 			  G_CALLBACK (new_account_dialog_response_cb),
@@ -452,14 +452,14 @@ account_chooser_dialog_response_cb (GtkDialog *dialog,
 		g_free (data->challange);
 		data->challange = NULL;
 		g_free (data->email);
-		data->email = gth_account_chooser_dialog_get_active (GTH_ACCOUNT_CHOOSER_DIALOG (dialog));
+		data->email = picasa_account_chooser_dialog_get_active (PICASA_ACCOUNT_CHOOSER_DIALOG (dialog));
 		if (data->email != NULL) {
 			gtk_widget_destroy (GTK_WIDGET (dialog));
 			connect_to_server (data);
 		}
 		break;
 
-	case GTH_ACCOUNT_CHOOSER_RESPONSE_NEW:
+	case PICASA_ACCOUNT_CHOOSER_RESPONSE_NEW:
 		gtk_widget_destroy (GTK_WIDGET (dialog));
 		new_account_dialog (data);
 		break;
@@ -521,8 +521,8 @@ new_album_dialog_response_cb (GtkDialog *dialog,
 			PicasaWebAlbum *album;
 
 			album = picasa_web_album_new ();
-			picasa_web_album_set_title (album, gth_album_properties_dialog_get_name (GTH_ALBUM_PROPERTIES_DIALOG (dialog)));
-			album->access = gth_album_properties_dialog_get_access (GTH_ALBUM_PROPERTIES_DIALOG (dialog));
+			picasa_web_album_set_title (album, picasa_album_properties_dialog_get_name (PICASA_ALBUM_PROPERTIES_DIALOG (dialog)));
+			album->access = picasa_album_properties_dialog_get_access (PICASA_ALBUM_PROPERTIES_DIALOG (dialog));
 			picasa_web_service_create_album (data->picasaweb,
 							 album,
 							 data->cancellable,
@@ -546,7 +546,7 @@ add_album_button_clicked_cb (GtkButton *button,
 	DialogData *data = user_data;
 	GtkWidget  *dialog;
 
-	dialog = gth_album_properties_dialog_new (NULL, PICASA_WEB_ACCESS_PUBLIC);  /* FIXME: use the current catalog/folder name as default value */
+	dialog = picasa_album_properties_dialog_new (NULL, PICASA_WEB_ACCESS_PUBLIC);  /* FIXME: use the current catalog/folder name as default value */
 	g_signal_connect (dialog,
 			  "response",
 			  G_CALLBACK (new_album_dialog_response_cb),
@@ -602,7 +602,7 @@ dlg_export_to_picasaweb (GthBrowser *browser)
 		else {
 			GtkWidget *dialog;
 
-			dialog = gth_account_chooser_dialog_new (data->accounts);
+			dialog = picasa_account_chooser_dialog_new (data->accounts);
 			g_signal_connect (dialog,
 					  "response",
 					  G_CALLBACK (account_chooser_dialog_response_cb),
diff --git a/extensions/picasaweb/gth-account-chooser-dialog.c b/extensions/picasaweb/picasa-account-chooser-dialog.c
similarity index 73%
rename from extensions/picasaweb/gth-account-chooser-dialog.c
rename to extensions/picasaweb/picasa-account-chooser-dialog.c
index 49e5e17..22186c3 100644
--- a/extensions/picasaweb/gth-account-chooser-dialog.c
+++ b/extensions/picasaweb/picasa-account-chooser-dialog.c
@@ -22,7 +22,7 @@
 
 #include <config.h>
 #include <glib/gi18n.h>
-#include "gth-account-chooser-dialog.h"
+#include "picasa-account-chooser-dialog.h"
 
 #define GET_WIDGET(x) (_gtk_builder_get_widget (self->priv->builder, (x)))
 
@@ -46,17 +46,17 @@ enum {
 static gpointer parent_class = NULL;
 
 
-struct _GthAccountChooserDialogPrivate {
+struct _PicasaAccountChooserDialogPrivate {
 	GtkBuilder *builder;
 };
 
 
 static void
-gth_account_chooser_dialog_finalize (GObject *object)
+picasa_account_chooser_dialog_finalize (GObject *object)
 {
-	GthAccountChooserDialog *self;
+	PicasaAccountChooserDialog *self;
 
-	self = GTH_ACCOUNT_CHOOSER_DIALOG (object);
+	self = PICASA_ACCOUNT_CHOOSER_DIALOG (object);
 
 	_g_object_unref (self->priv->builder);
 
@@ -65,24 +65,24 @@ gth_account_chooser_dialog_finalize (GObject *object)
 
 
 static void
-gth_account_chooser_dialog_class_init (GthAccountChooserDialogClass *klass)
+picasa_account_chooser_dialog_class_init (PicasaAccountChooserDialogClass *klass)
 {
 	GObjectClass *object_class;
 
 	parent_class = g_type_class_peek_parent (klass);
-	g_type_class_add_private (klass, sizeof (GthAccountChooserDialogPrivate));
+	g_type_class_add_private (klass, sizeof (PicasaAccountChooserDialogPrivate));
 
 	object_class = (GObjectClass*) klass;
-	object_class->finalize = gth_account_chooser_dialog_finalize;
+	object_class->finalize = picasa_account_chooser_dialog_finalize;
 }
 
 
 static void
-gth_account_chooser_dialog_init (GthAccountChooserDialog *self)
+picasa_account_chooser_dialog_init (PicasaAccountChooserDialog *self)
 {
 	GtkWidget *content;
 
-	self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_ACCOUNT_CHOOSER_DIALOG, GthAccountChooserDialogPrivate);
+	self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, PICASA_TYPE_ACCOUNT_CHOOSER_DIALOG, PicasaAccountChooserDialogPrivate);
 	self->priv->builder = _gtk_builder_new_from_file ("picasa-web-account-chooser.ui", "picasaweb");
 
 	gtk_window_set_resizable (GTK_WINDOW (self), FALSE);
@@ -96,7 +96,7 @@ gth_account_chooser_dialog_init (GthAccountChooserDialog *self)
 
 	gtk_dialog_add_button (GTK_DIALOG (self),
 			       GTK_STOCK_NEW,
-			       GTH_ACCOUNT_CHOOSER_RESPONSE_NEW);
+			       PICASA_ACCOUNT_CHOOSER_RESPONSE_NEW);
 	gtk_dialog_add_button (GTK_DIALOG (self),
 			       GTK_STOCK_CANCEL,
 			       GTK_RESPONSE_CANCEL);
@@ -108,25 +108,25 @@ gth_account_chooser_dialog_init (GthAccountChooserDialog *self)
 
 
 GType
-gth_account_chooser_dialog_get_type (void)
+picasa_account_chooser_dialog_get_type (void)
 {
 	static GType type = 0;
 
 	if (type == 0) {
 		static const GTypeInfo g_define_type_info = {
-			sizeof (GthAccountChooserDialogClass),
+			sizeof (PicasaAccountChooserDialogClass),
 			(GBaseInitFunc) NULL,
 			(GBaseFinalizeFunc) NULL,
-			(GClassInitFunc) gth_account_chooser_dialog_class_init,
+			(GClassInitFunc) picasa_account_chooser_dialog_class_init,
 			(GClassFinalizeFunc) NULL,
 			NULL,
-			sizeof (GthAccountChooserDialog),
+			sizeof (PicasaAccountChooserDialog),
 			0,
-			(GInstanceInitFunc) gth_account_chooser_dialog_init,
+			(GInstanceInitFunc) picasa_account_chooser_dialog_init,
 			NULL
 		};
 		type = g_type_register_static (GTK_TYPE_DIALOG,
-					       "GthAccountChooserDialog",
+					       "PicasaAccountChooserDialog",
 					       &g_define_type_info,
 					       0);
 	}
@@ -136,8 +136,8 @@ gth_account_chooser_dialog_get_type (void)
 
 
 static void
-gth_account_chooser_dialog_construct (GthAccountChooserDialog *self,
-				      GList                   *accounts)
+picasa_account_chooser_dialog_construct (PicasaAccountChooserDialog *self,
+				         GList                   *accounts)
 {
 	GtkTreeIter  iter;
 	GList       *scan;
@@ -161,19 +161,19 @@ gth_account_chooser_dialog_construct (GthAccountChooserDialog *self,
 
 
 GtkWidget *
-gth_account_chooser_dialog_new (GList *accounts)
+picasa_account_chooser_dialog_new (GList *accounts)
 {
-	GthAccountChooserDialog *self;
+	PicasaAccountChooserDialog *self;
 
-	self = g_object_new (GTH_TYPE_ACCOUNT_CHOOSER_DIALOG, NULL);
-	gth_account_chooser_dialog_construct (self, accounts);
+	self = g_object_new (PICASA_TYPE_ACCOUNT_CHOOSER_DIALOG, NULL);
+	picasa_account_chooser_dialog_construct (self, accounts);
 
 	return (GtkWidget *) self;
 }
 
 
 char *
-gth_account_chooser_dialog_get_active (GthAccountChooserDialog *self)
+picasa_account_chooser_dialog_get_active (PicasaAccountChooserDialog *self)
 {
 	GtkTreeIter  iter;
 	char        *email;
diff --git a/extensions/picasaweb/picasa-account-chooser-dialog.h b/extensions/picasaweb/picasa-account-chooser-dialog.h
new file mode 100644
index 0000000..fbc93fd
--- /dev/null
+++ b/extensions/picasaweb/picasa-account-chooser-dialog.h
@@ -0,0 +1,59 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+
+/*
+ *  GThumb
+ *
+ *  Copyright (C) 2010 Free Software Foundation, Inc.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
+ */
+ 
+#ifndef PICASA_ACCOUNT_CHOOSER_DIALOG_H
+#define PICASA_ACCOUNT_CHOOSER_DIALOG_H
+
+#include <gtk/gtk.h>
+#include <gthumb.h>
+
+G_BEGIN_DECLS
+
+#define PICASA_ACCOUNT_CHOOSER_RESPONSE_NEW 1
+
+#define PICASA_TYPE_ACCOUNT_CHOOSER_DIALOG            (picasa_account_chooser_dialog_get_type ())
+#define PICASA_ACCOUNT_CHOOSER_DIALOG(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), PICASA_TYPE_ACCOUNT_CHOOSER_DIALOG, PicasaAccountChooserDialog))
+#define PICASA_ACCOUNT_CHOOSER_DIALOG_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), PICASA_TYPE_ACCOUNT_CHOOSER_DIALOG, PicasaAccountChooserDialogClass))
+#define PICASA_IS_ACCOUNT_CHOOSER_DIALOG(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PICASA_TYPE_ACCOUNT_CHOOSER_DIALOG))
+#define PICASA_IS_ACCOUNT_CHOOSER_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PICASA_TYPE_ACCOUNT_CHOOSER_DIALOG))
+#define PICASA_ACCOUNT_CHOOSER_DIALOG_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), PICASA_TYPE_ACCOUNT_CHOOSER_DIALOG, PicasaAccountChooserDialogClass))
+
+typedef struct _PicasaAccountChooserDialog PicasaAccountChooserDialog;
+typedef struct _PicasaAccountChooserDialogClass PicasaAccountChooserDialogClass;
+typedef struct _PicasaAccountChooserDialogPrivate PicasaAccountChooserDialogPrivate;
+
+struct _PicasaAccountChooserDialog {
+	GtkDialog parent_instance;
+	PicasaAccountChooserDialogPrivate *priv;
+};
+
+struct _PicasaAccountChooserDialogClass {
+	GtkDialogClass parent_class;
+};
+
+GType          picasa_account_chooser_dialog_get_type    (void);
+GtkWidget *    picasa_account_chooser_dialog_new         (GList *accounts);
+char *         picasa_account_chooser_dialog_get_active  (PicasaAccountChooserDialog *self);
+
+G_END_DECLS
+
+#endif /* PICASA_ACCOUNT_CHOOSER_DIALOG_H */
diff --git a/extensions/picasaweb/gth-account-properties-dialog.c b/extensions/picasaweb/picasa-account-properties-dialog.c
similarity index 69%
rename from extensions/picasaweb/gth-account-properties-dialog.c
rename to extensions/picasaweb/picasa-account-properties-dialog.c
index bb26ff9..aa74fe3 100644
--- a/extensions/picasaweb/gth-account-properties-dialog.c
+++ b/extensions/picasaweb/picasa-account-properties-dialog.c
@@ -22,7 +22,7 @@
 
 #include <config.h>
 #include <glib/gi18n.h>
-#include "gth-account-properties-dialog.h"
+#include "picasa-account-properties-dialog.h"
 
 
 #define GET_WIDGET(x) (_gtk_builder_get_widget (self->priv->builder, (x)))
@@ -31,18 +31,18 @@
 static gpointer parent_class = NULL;
 
 
-struct _GthAccountPropertiesDialogPrivate {
+struct _PicasaAccountPropertiesDialogPrivate {
 	GtkBuilder   *builder;
 	GCancellable *cancellable;
 };
 
 
 static void
-gth_account_properties_dialog_finalize (GObject *object)
+picasa_account_properties_dialog_finalize (GObject *object)
 {
-	GthAccountPropertiesDialog *self;
+	PicasaAccountPropertiesDialog *self;
 
-	self = GTH_ACCOUNT_PROPERTIES_DIALOG (object);
+	self = PICASA_ACCOUNT_PROPERTIES_DIALOG (object);
 	_g_object_unref (self->priv->builder);
 	g_object_unref (self->priv->cancellable);
 
@@ -51,24 +51,24 @@ gth_account_properties_dialog_finalize (GObject *object)
 
 
 static void
-gth_account_properties_dialog_class_init (GthAccountPropertiesDialogClass *klass)
+picasa_account_properties_dialog_class_init (PicasaAccountPropertiesDialogClass *klass)
 {
 	GObjectClass *object_class;
 
 	parent_class = g_type_class_peek_parent (klass);
-	g_type_class_add_private (klass, sizeof (GthAccountPropertiesDialogPrivate));
+	g_type_class_add_private (klass, sizeof (PicasaAccountPropertiesDialogPrivate));
 
 	object_class = (GObjectClass*) klass;
-	object_class->finalize = gth_account_properties_dialog_finalize;
+	object_class->finalize = picasa_account_properties_dialog_finalize;
 }
 
 
 static void
-gth_account_properties_dialog_init (GthAccountPropertiesDialog *self)
+picasa_account_properties_dialog_init (PicasaAccountPropertiesDialog *self)
 {
 	GtkWidget *content;
 
-	self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_ACCOUNT_PROPERTIES_DIALOG, GthAccountPropertiesDialogPrivate);
+	self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, PICASA_TYPE_ACCOUNT_PROPERTIES_DIALOG, PicasaAccountPropertiesDialogPrivate);
 	self->priv->cancellable = g_cancellable_new ();
 	self->priv->builder = _gtk_builder_new_from_file ("picasa-web-account-properties.ui", "picasaweb");
 
@@ -93,25 +93,25 @@ gth_account_properties_dialog_init (GthAccountPropertiesDialog *self)
 
 
 GType
-gth_account_properties_dialog_get_type (void)
+picasa_account_properties_dialog_get_type (void)
 {
 	static GType type = 0;
 
 	if (type == 0) {
 		static const GTypeInfo g_define_type_info = {
-			sizeof (GthAccountPropertiesDialogClass),
+			sizeof (PicasaAccountPropertiesDialogClass),
 			(GBaseInitFunc) NULL,
 			(GBaseFinalizeFunc) NULL,
-			(GClassInitFunc) gth_account_properties_dialog_class_init,
+			(GClassInitFunc) picasa_account_properties_dialog_class_init,
 			(GClassFinalizeFunc) NULL,
 			NULL,
-			sizeof (GthAccountPropertiesDialog),
+			sizeof (PicasaAccountPropertiesDialog),
 			0,
-			(GInstanceInitFunc) gth_account_properties_dialog_init,
+			(GInstanceInitFunc) picasa_account_properties_dialog_init,
 			NULL
 		};
 		type = g_type_register_static (GTK_TYPE_DIALOG,
-					       "GthAccountPropertiesDialog",
+					       "PicasaAccountPropertiesDialog",
 					       &g_define_type_info,
 					       0);
 	}
@@ -126,7 +126,7 @@ image_buffer_ready_cb (void     *buffer,
 		       GError   *error,
 		       gpointer  user_data)
 {
-	GthAccountPropertiesDialog *self = user_data;
+	PicasaAccountPropertiesDialog *self = user_data;
 	GInputStream               *stream;
 	GdkPixbuf                  *pixbuf;
 
@@ -148,10 +148,10 @@ image_buffer_ready_cb (void     *buffer,
 
 
 static void
-gth_account_properties_dialog_construct (GthAccountPropertiesDialog *self,
-					 const char                 *email,
-					 const char                 *password,
-					 const char                 *challange_url)
+picasa_account_properties_dialog_construct (PicasaAccountPropertiesDialog *self,
+					    const char                 *email,
+					    const char                 *password,
+					    const char                 *challange_url)
 {
 	if (email != NULL)
 		gtk_entry_set_text (GTK_ENTRY (GET_WIDGET ("email_entry")), email);
@@ -178,35 +178,35 @@ gth_account_properties_dialog_construct (GthAccountPropertiesDialog *self,
 
 
 GtkWidget *
-gth_account_properties_dialog_new (const char *email,
-			           const char *password,
-				   const char *challange_url)
+picasa_account_properties_dialog_new (const char *email,
+			              const char *password,
+				      const char *challange_url)
 {
-	GthAccountPropertiesDialog *self;
+	PicasaAccountPropertiesDialog *self;
 
-	self = g_object_new (GTH_TYPE_ACCOUNT_PROPERTIES_DIALOG, NULL);
-	gth_account_properties_dialog_construct (self, email, password, challange_url);
+	self = g_object_new (PICASA_TYPE_ACCOUNT_PROPERTIES_DIALOG, NULL);
+	picasa_account_properties_dialog_construct (self, email, password, challange_url);
 
 	return (GtkWidget *) self;
 }
 
 
 const char *
-gth_account_properties_dialog_get_email (GthAccountPropertiesDialog *self)
+picasa_account_properties_dialog_get_email (PicasaAccountPropertiesDialog *self)
 {
 	return gtk_entry_get_text (GTK_ENTRY (GET_WIDGET ("email_entry")));
 }
 
 
 const char *
-gth_account_properties_dialog_get_password (GthAccountPropertiesDialog *self)
+picasa_account_properties_dialog_get_password (PicasaAccountPropertiesDialog *self)
 {
 	return gtk_entry_get_text (GTK_ENTRY (GET_WIDGET ("password_entry")));
 }
 
 
 const char *
-gth_account_properties_dialog_get_challange (GthAccountPropertiesDialog *self)
+picasa_account_properties_dialog_get_challange (PicasaAccountPropertiesDialog *self)
 {
 	return gtk_entry_get_text (GTK_ENTRY (GET_WIDGET ("challenge_entry")));
 }
diff --git a/extensions/picasaweb/picasa-account-properties-dialog.h b/extensions/picasaweb/picasa-account-properties-dialog.h
new file mode 100644
index 0000000..dc33e96
--- /dev/null
+++ b/extensions/picasaweb/picasa-account-properties-dialog.h
@@ -0,0 +1,61 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+
+/*
+ *  GThumb
+ *
+ *  Copyright (C) 2010 Free Software Foundation, Inc.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
+ */
+ 
+#ifndef PICASA_ACCOUNT_PROPERTIES_DIALOG_H
+#define PICASA_ACCOUNT_PROPERTIES_DIALOG_H
+
+#include <gtk/gtk.h>
+#include <gthumb.h>
+
+G_BEGIN_DECLS
+
+#define PICASA_TYPE_ACCOUNT_PROPERTIES_DIALOG            (picasa_account_properties_dialog_get_type ())
+#define PICASA_ACCOUNT_PROPERTIES_DIALOG(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), PICASA_TYPE_ACCOUNT_PROPERTIES_DIALOG, PicasaAccountPropertiesDialog))
+#define PICASA_ACCOUNT_PROPERTIES_DIALOG_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), PICASA_TYPE_ACCOUNT_PROPERTIES_DIALOG, PicasaAccountPropertiesDialogClass))
+#define PICASA_IS_ACCOUNT_PROPERTIES_DIALOG(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PICASA_TYPE_ACCOUNT_PROPERTIES_DIALOG))
+#define PICASA_IS_ACCOUNT_PROPERTIES_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PICASA_TYPE_ACCOUNT_PROPERTIES_DIALOG))
+#define PICASA_ACCOUNT_PROPERTIES_DIALOG_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), PICASA_TYPE_ACCOUNT_PROPERTIES_DIALOG, PicasaAccountPropertiesDialogClass))
+
+typedef struct _PicasaAccountPropertiesDialog PicasaAccountPropertiesDialog;
+typedef struct _PicasaAccountPropertiesDialogClass PicasaAccountPropertiesDialogClass;
+typedef struct _PicasaAccountPropertiesDialogPrivate PicasaAccountPropertiesDialogPrivate;
+
+struct _PicasaAccountPropertiesDialog {
+	GtkDialog parent_instance;
+	PicasaAccountPropertiesDialogPrivate *priv;
+};
+
+struct _PicasaAccountPropertiesDialogClass {
+	GtkDialogClass parent_class;
+};
+
+GType          picasa_account_properties_dialog_get_type      (void);
+GtkWidget *    picasa_account_properties_dialog_new           (const char *email,
+							       const char *password,
+							       const char *challange);
+const char *   picasa_account_properties_dialog_get_email     (PicasaAccountPropertiesDialog *self);
+const char *   picasa_account_properties_dialog_get_password  (PicasaAccountPropertiesDialog *self);
+const char *   picasa_account_properties_dialog_get_challange (PicasaAccountPropertiesDialog *self);
+
+G_END_DECLS
+
+#endif /* PICASA_ACCOUNT_PROPERTIES_DIALOG_H */
diff --git a/extensions/picasaweb/gth-album-properties-dialog.c b/extensions/picasaweb/picasa-album-properties-dialog.c
similarity index 69%
rename from extensions/picasaweb/gth-album-properties-dialog.c
rename to extensions/picasaweb/picasa-album-properties-dialog.c
index 418a710..89603d6 100644
--- a/extensions/picasaweb/gth-album-properties-dialog.c
+++ b/extensions/picasaweb/picasa-album-properties-dialog.c
@@ -22,7 +22,7 @@
 
 #include <config.h>
 #include <glib/gi18n.h>
-#include "gth-album-properties-dialog.h"
+#include "picasa-album-properties-dialog.h"
 
 
 #define GET_WIDGET(x) (_gtk_builder_get_widget (self->priv->builder, (x)))
@@ -31,17 +31,17 @@
 static gpointer parent_class = NULL;
 
 
-struct _GthAlbumPropertiesDialogPrivate {
+struct _PicasaAlbumPropertiesDialogPrivate {
 	GtkBuilder *builder;
 };
 
 
 static void
-gth_album_properties_dialog_finalize (GObject *object)
+picasa_album_properties_dialog_finalize (GObject *object)
 {
-	GthAlbumPropertiesDialog *self;
+	PicasaAlbumPropertiesDialog *self;
 
-	self = GTH_ALBUM_PROPERTIES_DIALOG (object);
+	self = PICASA_ALBUM_PROPERTIES_DIALOG (object);
 	_g_object_unref (self->priv->builder);
 
 	G_OBJECT_CLASS (parent_class)->finalize (object);
@@ -49,24 +49,24 @@ gth_album_properties_dialog_finalize (GObject *object)
 
 
 static void
-gth_album_properties_dialog_class_init (GthAlbumPropertiesDialogClass *klass)
+picasa_album_properties_dialog_class_init (PicasaAlbumPropertiesDialogClass *klass)
 {
 	GObjectClass *object_class;
 
 	parent_class = g_type_class_peek_parent (klass);
-	g_type_class_add_private (klass, sizeof (GthAlbumPropertiesDialogPrivate));
+	g_type_class_add_private (klass, sizeof (PicasaAlbumPropertiesDialogPrivate));
 
 	object_class = (GObjectClass*) klass;
-	object_class->finalize = gth_album_properties_dialog_finalize;
+	object_class->finalize = picasa_album_properties_dialog_finalize;
 }
 
 
 static void
-gth_album_properties_dialog_init (GthAlbumPropertiesDialog *self)
+picasa_album_properties_dialog_init (PicasaAlbumPropertiesDialog *self)
 {
 	GtkWidget *content;
 
-	self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_ALBUM_PROPERTIES_DIALOG, GthAlbumPropertiesDialogPrivate);
+	self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, PICASA_TYPE_ALBUM_PROPERTIES_DIALOG, PicasaAlbumPropertiesDialogPrivate);
 	self->priv->builder = _gtk_builder_new_from_file ("picasa-web-album-properties.ui", "picasaweb");
 
 	gtk_window_set_resizable (GTK_WINDOW (self), FALSE);
@@ -87,25 +87,25 @@ gth_album_properties_dialog_init (GthAlbumPropertiesDialog *self)
 
 
 GType
-gth_album_properties_dialog_get_type (void)
+picasa_album_properties_dialog_get_type (void)
 {
 	static GType type = 0;
 
 	if (type == 0) {
 		static const GTypeInfo g_define_type_info = {
-			sizeof (GthAlbumPropertiesDialogClass),
+			sizeof (PicasaAlbumPropertiesDialogClass),
 			(GBaseInitFunc) NULL,
 			(GBaseFinalizeFunc) NULL,
-			(GClassInitFunc) gth_album_properties_dialog_class_init,
+			(GClassInitFunc) picasa_album_properties_dialog_class_init,
 			(GClassFinalizeFunc) NULL,
 			NULL,
-			sizeof (GthAlbumPropertiesDialog),
+			sizeof (PicasaAlbumPropertiesDialog),
 			0,
-			(GInstanceInitFunc) gth_album_properties_dialog_init,
+			(GInstanceInitFunc) picasa_album_properties_dialog_init,
 			NULL
 		};
 		type = g_type_register_static (GTK_TYPE_DIALOG,
-					       "GthAlbumPropertiesDialog",
+					       "PicasaAlbumPropertiesDialog",
 					       &g_define_type_info,
 					       0);
 	}
@@ -115,7 +115,7 @@ gth_album_properties_dialog_get_type (void)
 
 
 static void
-gth_album_properties_dialog_construct (GthAlbumPropertiesDialog *self,
+picasa_album_properties_dialog_construct (PicasaAlbumPropertiesDialog *self,
 				       const char               *name,
 				       PicasaWebAccess           access)
 {
@@ -126,27 +126,27 @@ gth_album_properties_dialog_construct (GthAlbumPropertiesDialog *self,
 
 
 GtkWidget *
-gth_album_properties_dialog_new (const char      *name,
+picasa_album_properties_dialog_new (const char      *name,
 				 PicasaWebAccess  access)
 {
-	GthAlbumPropertiesDialog *self;
+	PicasaAlbumPropertiesDialog *self;
 
-	self = g_object_new (GTH_TYPE_ALBUM_PROPERTIES_DIALOG, NULL);
-	gth_album_properties_dialog_construct (self, name, access);
+	self = g_object_new (PICASA_TYPE_ALBUM_PROPERTIES_DIALOG, NULL);
+	picasa_album_properties_dialog_construct (self, name, access);
 
 	return (GtkWidget *) self;
 }
 
 
 const char *
-gth_album_properties_dialog_get_name (GthAlbumPropertiesDialog *self)
+picasa_album_properties_dialog_get_name (PicasaAlbumPropertiesDialog *self)
 {
 	return gtk_entry_get_text (GTK_ENTRY (GET_WIDGET ("name_entry")));
 }
 
 
 PicasaWebAccess
-gth_album_properties_dialog_get_access (GthAlbumPropertiesDialog *self)
+picasa_album_properties_dialog_get_access (PicasaAlbumPropertiesDialog *self)
 {
 	if (gtk_combo_box_get_active (GTK_COMBO_BOX (GET_WIDGET ("visibility_combobox"))) == 0)
 		return PICASA_WEB_ACCESS_PUBLIC;
diff --git a/extensions/picasaweb/picasa-album-properties-dialog.h b/extensions/picasaweb/picasa-album-properties-dialog.h
new file mode 100644
index 0000000..fdb9845
--- /dev/null
+++ b/extensions/picasaweb/picasa-album-properties-dialog.h
@@ -0,0 +1,60 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+
+/*
+ *  GThumb
+ *
+ *  Copyright (C) 2010 Free Software Foundation, Inc.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
+ */
+ 
+#ifndef PICASA_ALBUM_PROPERTIES_DIALOG_H
+#define PICASA_ALBUM_PROPERTIES_DIALOG_H
+
+#include <gtk/gtk.h>
+#include <gthumb.h>
+#include "picasa-web-album.h"
+
+G_BEGIN_DECLS
+
+#define PICASA_TYPE_ALBUM_PROPERTIES_DIALOG            (picasa_album_properties_dialog_get_type ())
+#define PICASA_ALBUM_PROPERTIES_DIALOG(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), PICASA_TYPE_ALBUM_PROPERTIES_DIALOG, PicasaAlbumPropertiesDialog))
+#define PICASA_ALBUM_PROPERTIES_DIALOG_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), PICASA_TYPE_ALBUM_PROPERTIES_DIALOG, PicasaAlbumPropertiesDialogClass))
+#define PICASA_IS_ALBUM_PROPERTIES_DIALOG(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PICASA_TYPE_ALBUM_PROPERTIES_DIALOG))
+#define PICASA_IS_ALBUM_PROPERTIES_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PICASA_TYPE_ALBUM_PROPERTIES_DIALOG))
+#define PICASA_ALBUM_PROPERTIES_DIALOG_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), PICASA_TYPE_ALBUM_PROPERTIES_DIALOG, PicasaAlbumPropertiesDialogClass))
+
+typedef struct _PicasaAlbumPropertiesDialog PicasaAlbumPropertiesDialog;
+typedef struct _PicasaAlbumPropertiesDialogClass PicasaAlbumPropertiesDialogClass;
+typedef struct _PicasaAlbumPropertiesDialogPrivate PicasaAlbumPropertiesDialogPrivate;
+
+struct _PicasaAlbumPropertiesDialog {
+	GtkDialog parent_instance;
+	PicasaAlbumPropertiesDialogPrivate *priv;
+};
+
+struct _PicasaAlbumPropertiesDialogClass {
+	GtkDialogClass parent_class;
+};
+
+GType            picasa_album_properties_dialog_get_type      (void);
+GtkWidget *      picasa_album_properties_dialog_new           (const char                  *name,
+							       PicasaWebAccess              access);
+const char *     picasa_album_properties_dialog_get_name      (PicasaAlbumPropertiesDialog *self);
+PicasaWebAccess  picasa_album_properties_dialog_get_access    (PicasaAlbumPropertiesDialog *self);
+
+G_END_DECLS
+
+#endif /* PICASA_ALBUM_PROPERTIES_DIALOG_H */
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]