quick-lounge-applet r213 - in trunk: . src

[paobac svn gnome org]

Author: paobac
Date: Fri May  9 08:08:49 2008
New Revision: 213
URL: http://svn.gnome.org/viewvc/quick-lounge-applet?rev=213&view=rev

Log:
2008-05-09  Paolo Bacchilega  <paobac svn gnome org>

	* src/quick-lounge.c (about_verb_cb): fixed logo loading in the
	about dialog.  Updated the copyright year.

2008-05-09  Paolo Bacchilega  <paobac svn gnome org>
	
	* src/quick-box.c (quick_box_size_allocate): 
	(get_child_size): 
	(quick_box_size_request): 

	Fixed bug #531358 â Applet height in vertical mode.
	Patch by Alexander Kojevnikov.

2008-05-09  Paolo Bacchilega  <paobac svn gnome org>

	* configure.in: 
	
	post release version bump.

Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/src/quick-box.c
   trunk/src/quick-lounge.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Fri May  9 08:08:49 2008
@@ -1,6 +1,6 @@
 AC_PREREQ(2.52)
 
-AC_INIT([quick-lounge-applet],[2.12.5],[http://bugzilla.gnome.org/enter_bug.cgi?product=quick-lounge-applet])
+AC_INIT([quick-lounge-applet],[2.12.6],[http://bugzilla.gnome.org/enter_bug.cgi?product=quick-lounge-applet])
 
 AC_CONFIG_SRCDIR(src/quick-lounge.c)
 

Modified: trunk/src/quick-box.c
==============================================================================
--- trunk/src/quick-box.c	(original)
+++ trunk/src/quick-box.c	Fri May  9 08:08:49 2008
@@ -364,9 +364,15 @@
 		max_size += spacing + arrow_height;
 		if (children == NULL) /* when the box is empty */
 			min_size = p->size / p->rows; 
-		requisition->width = MAX (p->size, arrow_width);
-		requisition->height = min_size;
-		p->size_hint[SIZE_HINT_MAX] = max_size - requisition->height;
+
+		/* FIXME: 
+		When the orientation is vertical, requisition->width expects the
+		height, and requisition->height expects the width. I don't know 
+		if this is by design or if it's a bug in gnome-panel, but 
+		swapping the width and the height works for now. */
+		requisition->height = MAX (p->size, arrow_width);
+		requisition->width = min_size;
+		p->size_hint[SIZE_HINT_MAX] = max_size - requisition->width;
 	}
 
 	p->size_hint[SIZE_HINT_MIN] = 0;
@@ -548,8 +554,7 @@
 	    (quick_box->priv->rows == 1))
 		return quick_box->priv->size;
 
-	child_size = quick_box->priv->size / quick_box->priv->rows;
-	child_size -= (quick_box->priv->rows - 1) * ICON_SPACING;
+	child_size = (quick_box->priv->size - (quick_box->priv->rows - 1) * ICON_SPACING) / quick_box->priv->rows;
 
 	return MAX (0, child_size);
 }
@@ -783,7 +788,7 @@
 						child_requisition.width);
 	else
 		widget->allocation.height = MAX (widget->allocation.height, 
-						 child_requisition.height);
+						 child_requisition.width);
 
 	g_list_free (children);
 }

Modified: trunk/src/quick-lounge.c
==============================================================================
--- trunk/src/quick-lounge.c	(original)
+++ trunk/src/quick-lounge.c	Fri May  9 08:08:49 2008
@@ -133,8 +133,6 @@
 	       const gchar       *verbname)
 {
         static GtkWidget *about_dialog = NULL;
-	GdkPixbuf  *pixbuf = NULL;
-        char       *file;
 	const char *authors[] = {
 		"Paolo Bacchilega <paolo bacchilega libero it>",
 		NULL
@@ -154,26 +152,17 @@
 
         about_dialog = gtk_about_dialog_new ();
 
-	file = gnome_program_locate_file (NULL, GNOME_FILE_DOMAIN_PIXMAP, "quick-lounge-applet.png", TRUE, NULL);
-	if (file != NULL) {
-		pixbuf = gdk_pixbuf_new_from_file (file, NULL);
-		g_free(file);
-	}
-
         g_object_set (about_dialog,	
 		      "name", _("Launchers List"),
 	              "version", VERSION,
-		      "copyright", "Copyright \xc2\xa9 2002-2005 Free Software Foundation, Inc.",
+		      "copyright", "Copyright \xc2\xa9 2002-2008 Free Software Foundation, Inc.",
 	              "comments", _("Organize your favorite applications on the Panel"),
 	              "authors", authors,
 	              "documenters", documenters,
     	              "translator-credits", strcmp (translator_credits, "translator_credits") != 0 ? translator_credits : NULL,
-	              "logo", pixbuf,
+	              "logo-icon-name", "quick-lounge-applet",
 	              NULL);
 
-	if (pixbuf)
-		g_object_unref (pixbuf);
-
 	gtk_window_set_wmclass (GTK_WINDOW (about_dialog), "quick-lounge-applet", "Quick-lounge-applet"); 
         gtk_window_set_screen (GTK_WINDOW (about_dialog), gtk_widget_get_screen (GTK_WIDGET (quick_lounge->applet)));
 	g_signal_connect (about_dialog, "destroy", G_CALLBACK (gtk_widget_destroyed), &about_dialog);
@@ -1477,9 +1466,6 @@
 }
 
 
-
-
-
 static gboolean
 applet_button_press_cb (GtkWidget         *widget,
 			GdkEventButton    *event)