[Buoh-dev] CVS commit to /cvsroot/buoh/buoh/src by carlosgc

[noreply at forge.novell.com (noreply forge novell com)]

CVS commit to /cvsroot/buoh/buoh/src by carlosgc

Modified Files:
	buoh-comic-loader.c buoh-view-message.c buoh-view.c 
	buoh-window.c main.c 
Log Message:
2006-09-25  Carlos Garcia Campos  <carlosgc gnome org>
	* INSTALL: Removed, it's a generated file
	* configure.in: Don't use deprecated AM init macro
	* src/buoh-comic-loader.c: Remove stupid debug message
	* data/Makefile.am:
	* data/buoh.desktop.in:
	* data/icons/Makefile.am:
	* data/icons/16x16/Makefile.am:
	* data/icons/16x16/buoh.png:
	* data/icons/64x64/Makefile.am:
	* data/icons/64x64/buoh.png:
	* src/buoh-view-message.c:
	* src/buoh-view.c:
	* src/buoh-window.c:
	* src/main.c:
	Install icons acording to the icon theme specification.

===================================================================
RCS file: /cvsroot/buoh/buoh/src/buoh-comic-loader.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- /cvsroot/buoh/buoh/src/buoh-comic-loader.c	2006/09/24 18:31:42	1.13
+++ /cvsroot/buoh/buoh/src/buoh-comic-loader.c	2006/09/25 18:18:33	1.14
@@ -278,7 +278,6 @@
 			job->error = g_error_new (BUOH_COMIC_LOADER_ERROR,
 						  (gint) msg->status_code,
 						  msg->reason_phrase);
-			g_print ("DBG: error reading chunk\n");
 		}
 
 		soup_message_set_status (msg, SOUP_STATUS_CANCELLED);
===================================================================
RCS file: /cvsroot/buoh/buoh/src/buoh-view-message.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- /cvsroot/buoh/buoh/src/buoh-view-message.c	2005/11/16 20:29:28	1.4
+++ /cvsroot/buoh/buoh/src/buoh-view-message.c	2006/09/25 18:18:33	1.5
@@ -178,28 +178,30 @@
 void
 buoh_view_message_set_icon (BuohViewMessage *m_view, const gchar *icon)
 {
-	gchar       *icon_path;
-	GdkPixbuf   *pixbuf = NULL;
-	GtkStockItem item;
+	GdkPixbuf           *pixbuf = NULL;
+	GError              *error = NULL;
+	static GtkIconTheme *icon_theme = NULL;
 
 	g_return_if_fail (BUOH_IS_VIEW_MESSAGE (m_view));
 	g_return_if_fail (icon != NULL);
 
-	if (gtk_stock_lookup (icon, &item)) {
-		gtk_image_set_from_stock (GTK_IMAGE (m_view->priv->icon), icon,
-					  GTK_ICON_SIZE_DIALOG);
-	} else {
-		icon_path = g_build_filename (PIXMAPS_DIR, icon, NULL);
-		pixbuf = gdk_pixbuf_new_from_file_at_size (icon_path, 48, 48, NULL);
-		g_free (icon_path);
+	if (!icon_theme)
+		icon_theme = gtk_icon_theme_get_default ();
 
-		if (pixbuf) {
-			gtk_image_set_from_pixbuf (GTK_IMAGE (m_view->priv->icon),
-						   pixbuf);
-			g_object_unref (pixbuf);
-		} else {
-			gtk_image_set_from_stock (GTK_IMAGE (m_view->priv->icon),
-						  NULL, GTK_ICON_SIZE_DIALOG);
-		}
+	pixbuf = gtk_icon_theme_load_icon (icon_theme,
+					   icon,
+					   64,
+					   0,
+					   &error);
+	if (error) {
+		g_warning (error->message);
+		g_error_free (error);
+
+		return;
+	}
+
+	if (pixbuf) {
+		gtk_image_set_from_pixbuf (GTK_IMAGE (m_view->priv->icon), pixbuf);
+		g_object_unref (pixbuf);
 	}
 }
===================================================================
RCS file: /cvsroot/buoh/buoh/src/buoh-view.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- /cvsroot/buoh/buoh/src/buoh-view.c	2005/11/16 20:29:28	1.12
+++ /cvsroot/buoh/buoh/src/buoh-view.c	2006/09/25 18:18:33	1.13
@@ -164,8 +164,7 @@
 				      "to add or remove comics to the list click on Comic -> Add. "
 				      "Just select a comic from the list, and it will be displayed "
 				      "on the right side. Thanks for using Buoh."));
-	buoh_view_message_set_icon (BUOH_VIEW_MESSAGE (buoh_view->priv->message),
-				    "buoh64x64.png");
+	buoh_view_message_set_icon (BUOH_VIEW_MESSAGE (buoh_view->priv->message), "buoh");
 	gtk_container_add (GTK_CONTAINER (swindow),
 			   buoh_view->priv->message);
 	gtk_widget_show (buoh_view->priv->message);
===================================================================
RCS file: /cvsroot/buoh/buoh/src/buoh-window.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- /cvsroot/buoh/buoh/src/buoh-window.c	2006/09/24 18:31:42	1.32
+++ /cvsroot/buoh/buoh/src/buoh-window.c	2006/09/25 18:18:33	1.33
@@ -249,7 +249,6 @@
 static void
 buoh_window_init (BuohWindow *buoh_window)
 {
-	gchar            *icon_path;
 	GtkWidget        *tree_view;
 	GtkTreeSelection *selection;
 	GtkWidget        *vbox, *paned, *menubar;
@@ -264,10 +263,7 @@
 	buoh_window->priv = BUOH_WINDOW_GET_PRIVATE (buoh_window);
 
 	gtk_window_set_title (GTK_WINDOW (buoh_window), "Buoh");
-
-	icon_path = g_build_filename (PIXMAPS_DIR, "buoh16x16.png", NULL);
-	gtk_window_set_icon_from_file (GTK_WINDOW (buoh_window), icon_path, NULL);
-	g_free (icon_path);
+	gtk_window_set_icon_name (GTK_WINDOW (buoh_window), "buoh");
 
 	buoh_window->priv->properties = NULL;
 	buoh_window->priv->add_dialog = NULL;
@@ -809,30 +805,21 @@
 buoh_window_cmd_help_about (GtkAction *action, gpointer gdata)
 {
 	BuohWindow         *window = BUOH_WINDOW (gdata);
-	GdkPixbuf          *pixbuf;
-	gchar              *pixbuf_path;
 	static const gchar *authors[] = {
 		"Esteban Sánchez Muñoz <esteban steve-o org>",
 		"Pablo Arroyo Loma <zioma linups org>",
 		"Carlos Garcia Campos <carlosgc gnome org>",
-		                NULL
+		NULL
 	};
 
-	pixbuf_path = g_build_filename (PIXMAPS_DIR, "buoh64x64.png", NULL);
-	pixbuf = gdk_pixbuf_new_from_file_at_size (pixbuf_path, 48, 48, NULL);
-	g_free (pixbuf_path);
-
 	gtk_show_about_dialog (GTK_WINDOW (window),
 			       "name", _("Buoh online comics reader"),
 			       "version", VERSION,
 			       "copyright", "Copyright \xC2\xA9 2004 Esteban Sánchez Muñoz - Pablo Arroyo Loma",
 			       "authors", authors,
 			       "translator-credits", _("translator-credits"),
-			       "logo", pixbuf,
+			       "logo-icon-name", "buoh",
 			       NULL);
-
-	if (pixbuf)
-		g_object_unref (pixbuf);
 }
 
 static void
===================================================================
RCS file: /cvsroot/buoh/buoh/src/main.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- /cvsroot/buoh/buoh/src/main.c	2005/11/10 21:08:26	1.9
+++ /cvsroot/buoh/buoh/src/main.c	2006/09/25 18:18:33	1.10
@@ -48,6 +48,7 @@
 			    GNOME_PARAM_NONE);
 
 	g_set_application_name (_("Buoh online comics browser"));
+	gtk_window_set_default_icon_name ("buoh");
 
 	/* Init threads */
 	if (!g_thread_supported ()) {