GNOME.org
 

gnome-panel r11158 - trunk/gnome-panel

Author: vuntz
Date: Mon Jun 30 16:41:50 2008
New Revision: 11158
URL: http://svn.gnome.org/viewvc/gnome-panel?rev=11158&view=rev

Log:
2008-06-30  Vincent Untz  <vuntz gnome org>

	Fix compiler warnings. Patch by Kjartan Maraas <kmaraas gnome org>.
	Part of bug #521409.

	* button-widget.c: (button_widget_unrealize),
	(button_widget_get_icon_theme), (button_widget_get_pixbuf):
	* launcher.c: (drag_drop_cb):
	* panel-action-button.c: (panel_action_connect_server):
	* panel-applet-frame.c:
	* panel-background-monitor.c:
	* panel-ditem-editor.c: (panel_ditem_editor_save):
	* panel-force-quit.c:
	* panel-frame.c:
	* panel-menu-bar.c:
	* panel-menu-button.c:
	* panel-menu-items.c:
	* panel-multiscreen.c: (panel_multiscreen_reinit):
	* panel-separator.c:
	* panel-toplevel.c: (panel_toplevel_calc_floating),
	(panel_toplevel_get_auto_hide):
	* panel-widget.c: (panel_widget_reparent):
	* xstuff.c: (zoom_expose):


Modified:
   trunk/gnome-panel/ChangeLog
   trunk/gnome-panel/button-widget.c
   trunk/gnome-panel/launcher.c
   trunk/gnome-panel/panel-action-button.c
   trunk/gnome-panel/panel-applet-frame.c
   trunk/gnome-panel/panel-background-monitor.c
   trunk/gnome-panel/panel-ditem-editor.c
   trunk/gnome-panel/panel-force-quit.c
   trunk/gnome-panel/panel-frame.c
   trunk/gnome-panel/panel-menu-bar.c
   trunk/gnome-panel/panel-menu-button.c
   trunk/gnome-panel/panel-menu-items.c
   trunk/gnome-panel/panel-multiscreen.c
   trunk/gnome-panel/panel-separator.c
   trunk/gnome-panel/panel-toplevel.c
   trunk/gnome-panel/panel-widget.c
   trunk/gnome-panel/xstuff.c

Modified: trunk/gnome-panel/button-widget.c
==============================================================================
--- trunk/gnome-panel/button-widget.c	(original)
+++ trunk/gnome-panel/button-widget.c	Mon Jun 30 16:41:50 2008
@@ -50,7 +50,7 @@
 
 #define BUTTON_WIDGET_DISPLACEMENT 2
 
-G_DEFINE_TYPE (ButtonWidget, button_widget, GTK_TYPE_BUTTON);
+G_DEFINE_TYPE (ButtonWidget, button_widget, GTK_TYPE_BUTTON)
 
 /* colorshift a pixbuf */
 static void
@@ -163,12 +163,10 @@
 button_widget_unrealize (GtkWidget *widget)
 {
 	GtkButton *button;
-	PanelWidget *panel;
 
 	g_return_if_fail (widget != NULL);
 	g_return_if_fail (BUTTON_IS_WIDGET (widget));
 
-	panel  = PANEL_WIDGET (widget->parent);
 	button = GTK_BUTTON (widget);
 
 	if (button->event_window != NULL) {
@@ -876,7 +874,7 @@
 GtkIconTheme *
 button_widget_get_icon_theme (ButtonWidget *button)
 {
-	g_return_val_if_fail (BUTTON_IS_WIDGET (button), FALSE);
+	g_return_val_if_fail (BUTTON_IS_WIDGET (button), NULL);
 
 	return button->priv->icon_theme;
 }
@@ -884,7 +882,7 @@
 GdkPixbuf *
 button_widget_get_pixbuf (ButtonWidget *button)
 {
-	g_return_val_if_fail (BUTTON_IS_WIDGET (button), FALSE);
+	g_return_val_if_fail (BUTTON_IS_WIDGET (button), NULL);
 
 	if (!button->priv->pixbuf)
 		return NULL;

Modified: trunk/gnome-panel/launcher.c
==============================================================================
--- trunk/gnome-panel/launcher.c	(original)
+++ trunk/gnome-panel/launcher.c	Mon Jun 30 16:41:50 2008
@@ -446,7 +446,7 @@
 	if ( ! is_this_drop_ok (widget, context))
 		return FALSE;
 
-	if (text_uri_list == 0)
+	if (text_uri_list == NULL)
 		text_uri_list = gdk_atom_intern_static_string ("text/uri-list");
 
 	gtk_drag_get_data (widget, context, text_uri_list, time);

Modified: trunk/gnome-panel/panel-action-button.c
==============================================================================
--- trunk/gnome-panel/panel-action-button.c	(original)
+++ trunk/gnome-panel/panel-action-button.c	Mon Jun 30 16:41:50 2008
@@ -49,7 +49,7 @@
 #include "panel-compatibility.h"
 #include "panel-icon-names.h"
 
-G_DEFINE_TYPE (PanelActionButton, panel_action_button, BUTTON_TYPE_WIDGET);
+G_DEFINE_TYPE (PanelActionButton, panel_action_button, BUTTON_TYPE_WIDGET)
 
 #define PANEL_ACTION_BUTTON_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PANEL_TYPE_ACTION_BUTTON, PanelActionButtonPrivate))
 
@@ -258,13 +258,11 @@
 					  &error);
 
 	if (error) {
-		GtkWidget *error_dialog;
-
-		error_dialog = panel_error_dialog (NULL, screen,
-						   "cannot_connect_server",
-						   TRUE,
-						   _("Could not connect to server"),
-						   error->message);
+		panel_error_dialog (NULL, screen,
+				    "cannot_connect_server",
+				    TRUE,
+				    _("Could not connect to server"),
+				    error->message);
 		g_clear_error (&error);
 	}
 }

Modified: trunk/gnome-panel/panel-applet-frame.c
==============================================================================
--- trunk/gnome-panel/panel-applet-frame.c	(original)
+++ trunk/gnome-panel/panel-applet-frame.c	Mon Jun 30 16:41:50 2008
@@ -42,7 +42,7 @@
 #include "panel-stock-icons.h"
 #include "xstuff.h"
 
-G_DEFINE_TYPE (PanelAppletFrame, panel_applet_frame, GTK_TYPE_EVENT_BOX);
+G_DEFINE_TYPE (PanelAppletFrame, panel_applet_frame, GTK_TYPE_EVENT_BOX)
 
 #define PANEL_APPLET_FRAME_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PANEL_TYPE_APPLET_FRAME, PanelAppletFramePrivate))
 

Modified: trunk/gnome-panel/panel-background-monitor.c
==============================================================================
--- trunk/gnome-panel/panel-background-monitor.c	(original)
+++ trunk/gnome-panel/panel-background-monitor.c	Mon Jun 30 16:41:50 2008
@@ -70,7 +70,7 @@
 	gboolean   display_grabbed;
 };
 
-G_DEFINE_TYPE (PanelBackgroundMonitor, panel_background_monitor, G_TYPE_OBJECT);
+G_DEFINE_TYPE (PanelBackgroundMonitor, panel_background_monitor, G_TYPE_OBJECT)
 
 static PanelBackgroundMonitor **global_background_monitors = NULL;
 

Modified: trunk/gnome-panel/panel-ditem-editor.c
==============================================================================
--- trunk/gnome-panel/panel-ditem-editor.c	(original)
+++ trunk/gnome-panel/panel-ditem-editor.c	Mon Jun 30 16:41:50 2008
@@ -169,7 +169,7 @@
 
 #define PANEL_DITEM_EDITOR_GET_PRIVATE(o)  (PANEL_DITEM_EDITOR (o)->priv)
 
-G_DEFINE_TYPE (PanelDItemEditor, panel_ditem_editor, GTK_TYPE_DIALOG);
+G_DEFINE_TYPE (PanelDItemEditor, panel_ditem_editor, GTK_TYPE_DIALOG)
 
 static void panel_ditem_editor_setup_ui (PanelDItemEditor *dialog);
 
@@ -1362,17 +1362,17 @@
 	if (!dialog->priv->type_directory &&
 	    (const_buf == NULL || const_buf [0] == '\0')) {
 		PanelDItemEditorType  type;
-		char                 *error;
+		char                 *err;
 
 		type = panel_ditem_editor_get_item_type (dialog);
 
 		switch (type) {
 		case PANEL_DITEM_EDITOR_TYPE_APPLICATION:
 		case PANEL_DITEM_EDITOR_TYPE_TERMINAL_APPLICATION:
-			error = _("The command of the launcher is not set.");
+			err = _("The command of the launcher is not set.");
 			break;
 		case PANEL_DITEM_EDITOR_TYPE_LINK:
-			error = _("The location of the launcher is not set.");
+			err = _("The location of the launcher is not set.");
 			break;
 		default:
 			g_assert_not_reached ();
@@ -1381,8 +1381,7 @@
 		if (report_errors)
 			g_signal_emit (G_OBJECT (dialog),
 				       ditem_edit_signals[ERROR_REPORTED], 0,
-				       _("Could not save launcher"),
-				       error);
+				       _("Could not save launcher"), err);
 		return FALSE;
 	}
 

Modified: trunk/gnome-panel/panel-force-quit.c
==============================================================================
--- trunk/gnome-panel/panel-force-quit.c	(original)
+++ trunk/gnome-panel/panel-force-quit.c	Mon Jun 30 16:41:50 2008
@@ -35,9 +35,9 @@
 #include "panel-icon-names.h"
 #include "panel-stock-icons.h"
 
-GdkFilterReturn popup_filter (GdkXEvent *gdk_xevent,
-			      GdkEvent  *event,
-			      GtkWidget *popup);
+static GdkFilterReturn popup_filter (GdkXEvent *gdk_xevent,
+				     GdkEvent  *event,
+				     GtkWidget *popup);
 
 static Atom wm_state_atom = None;
 
@@ -248,7 +248,7 @@
 	}
 }
 
-GdkFilterReturn
+static GdkFilterReturn
 popup_filter (GdkXEvent *gdk_xevent,
 	      GdkEvent  *event,
 	      GtkWidget *popup)

Modified: trunk/gnome-panel/panel-frame.c
==============================================================================
--- trunk/gnome-panel/panel-frame.c	(original)
+++ trunk/gnome-panel/panel-frame.c	Mon Jun 30 16:41:50 2008
@@ -28,7 +28,7 @@
 
 #include "panel-typebuiltins.h"
 
-G_DEFINE_TYPE (PanelFrame, panel_frame, GTK_TYPE_BIN);
+G_DEFINE_TYPE (PanelFrame, panel_frame, GTK_TYPE_BIN)
 
 enum {
 	PROP_0,

Modified: trunk/gnome-panel/panel-menu-bar.c
==============================================================================
--- trunk/gnome-panel/panel-menu-bar.c	(original)
+++ trunk/gnome-panel/panel-menu-bar.c	Mon Jun 30 16:41:50 2008
@@ -44,7 +44,7 @@
 #include "panel-typebuiltins.h"
 #include "panel-icon-names.h"
 
-G_DEFINE_TYPE (PanelMenuBar, panel_menu_bar, GTK_TYPE_MENU_BAR);
+G_DEFINE_TYPE (PanelMenuBar, panel_menu_bar, GTK_TYPE_MENU_BAR)
 
 #define PANEL_MENU_BAR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PANEL_TYPE_MENU_BAR, PanelMenuBarPrivate))
 

Modified: trunk/gnome-panel/panel-menu-button.c
==============================================================================
--- trunk/gnome-panel/panel-menu-button.c	(original)
+++ trunk/gnome-panel/panel-menu-button.c	Mon Jun 30 16:41:50 2008
@@ -41,7 +41,7 @@
 #include "panel-a11y.h"
 #include "panel-icon-names.h"
 
-G_DEFINE_TYPE (PanelMenuButton, panel_menu_button, BUTTON_TYPE_WIDGET);
+G_DEFINE_TYPE (PanelMenuButton, panel_menu_button, BUTTON_TYPE_WIDGET)
 
 #define PANEL_MENU_BUTTON_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PANEL_TYPE_MENU_BUTTON, PanelMenuButtonPrivate))
 

Modified: trunk/gnome-panel/panel-menu-items.c
==============================================================================
--- trunk/gnome-panel/panel-menu-items.c	(original)
+++ trunk/gnome-panel/panel-menu-items.c	Mon Jun 30 16:41:50 2008
@@ -63,8 +63,8 @@
 #define COMPUTER_NAME_KEY       "/apps/nautilus/desktop/computer_icon_name"
 #define MAX_ITEMS_OR_SUBMENU    5
 
-G_DEFINE_TYPE (PanelPlaceMenuItem, panel_place_menu_item, GTK_TYPE_IMAGE_MENU_ITEM);
-G_DEFINE_TYPE (PanelDesktopMenuItem, panel_desktop_menu_item, GTK_TYPE_IMAGE_MENU_ITEM);
+G_DEFINE_TYPE (PanelPlaceMenuItem, panel_place_menu_item, GTK_TYPE_IMAGE_MENU_ITEM)
+G_DEFINE_TYPE (PanelDesktopMenuItem, panel_desktop_menu_item, GTK_TYPE_IMAGE_MENU_ITEM)
 
 #define PANEL_PLACE_MENU_ITEM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PANEL_TYPE_PLACE_MENU_ITEM, PanelPlaceMenuItemPrivate))
 #define PANEL_DESKTOP_MENU_ITEM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PANEL_TYPE_DESKTOP_MENU_ITEM, PanelDesktopMenuItemPrivate))

Modified: trunk/gnome-panel/panel-multiscreen.c
==============================================================================
--- trunk/gnome-panel/panel-multiscreen.c	(original)
+++ trunk/gnome-panel/panel-multiscreen.c	Mon Jun 30 16:41:50 2008
@@ -88,10 +88,10 @@
 		g_free (monitors);
 
 	if (geometries) {
-		int i;
+		int j;
 
-		for (i = 0; i < screens; i++)
-			g_free (geometries[i]);
+		for (j = 0; j < screens; j++)
+			g_free (geometries[j]);
 		g_free (geometries);
 	}
 

Modified: trunk/gnome-panel/panel-separator.c
==============================================================================
--- trunk/gnome-panel/panel-separator.c	(original)
+++ trunk/gnome-panel/panel-separator.c	Mon Jun 30 16:41:50 2008
@@ -39,7 +39,7 @@
 	GtkOrientation  orientation;
 };
 
-G_DEFINE_TYPE (PanelSeparator, panel_separator, GTK_TYPE_EVENT_BOX);
+G_DEFINE_TYPE (PanelSeparator, panel_separator, GTK_TYPE_EVENT_BOX)
 
 static void
 panel_separator_paint (GtkWidget    *widget,

Modified: trunk/gnome-panel/panel-toplevel.c
==============================================================================
--- trunk/gnome-panel/panel-toplevel.c	(original)
+++ trunk/gnome-panel/panel-toplevel.c	Mon Jun 30 16:41:50 2008
@@ -48,7 +48,7 @@
 #include "panel-config-global.h"
 #include "panel-lockdown.h"
 
-G_DEFINE_TYPE (PanelToplevel, panel_toplevel, GTK_TYPE_WINDOW);
+G_DEFINE_TYPE (PanelToplevel, panel_toplevel, GTK_TYPE_WINDOW)
 
 #define PANEL_TOPLEVEL_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PANEL_TYPE_TOPLEVEL, PanelToplevelPrivate))
 
@@ -1045,7 +1045,6 @@
 static void
 panel_toplevel_calc_floating (PanelToplevel *toplevel)
 {
-	GdkScreen *screen;
 	int        screen_width, screen_height;
 	int        monitor_x, monitor_y;
 	int        monitor_width, monitor_height;
@@ -1057,9 +1056,8 @@
 		return;
 	}
 
-	screen = panel_toplevel_get_screen_geometry (
-			toplevel, &screen_width, &screen_height);
-
+	panel_toplevel_get_screen_geometry (toplevel,
+					    &screen_width, &screen_height);
 	panel_toplevel_get_monitor_geometry (toplevel, &monitor_x, &monitor_y,
 					     &monitor_width, &monitor_height);
 
@@ -4963,7 +4961,7 @@
 gboolean
 panel_toplevel_get_auto_hide (PanelToplevel *toplevel)
 {
-	g_return_val_if_fail (PANEL_IS_TOPLEVEL (toplevel), -1);
+	g_return_val_if_fail (PANEL_IS_TOPLEVEL (toplevel), FALSE);
 
 	return toplevel->priv->auto_hide;
 }

Modified: trunk/gnome-panel/panel-widget.c
==============================================================================
--- trunk/gnome-panel/panel-widget.c	(original)
+++ trunk/gnome-panel/panel-widget.c	Mon Jun 30 16:41:50 2008
@@ -2548,13 +2548,13 @@
 	GtkWidget *focus_widget = NULL;
 	AppletInfo* info;
 
-	g_return_val_if_fail(PANEL_IS_WIDGET(old_panel),-1);
-	g_return_val_if_fail(PANEL_IS_WIDGET(new_panel),-1);
-	g_return_val_if_fail(GTK_IS_WIDGET(applet),-1);
-	g_return_val_if_fail(pos>=0,-1);
+	g_return_val_if_fail(PANEL_IS_WIDGET(old_panel), FALSE);
+	g_return_val_if_fail(PANEL_IS_WIDGET(new_panel), FALSE);
+	g_return_val_if_fail(GTK_IS_WIDGET(applet), FALSE);
+	g_return_val_if_fail(pos>=0, FALSE);
 
 	ad = g_object_get_data (G_OBJECT (applet), PANEL_APPLET_DATA);
-	g_return_val_if_fail(ad!=NULL,-1);
+	g_return_val_if_fail(ad!=NULL, FALSE);
 
 	/* Don't try and reparent to an explicitly hidden panel,
 	 * very confusing for the user ...

Modified: trunk/gnome-panel/xstuff.c
==============================================================================
--- trunk/gnome-panel/xstuff.c	(original)
+++ trunk/gnome-panel/xstuff.c	Mon Jun 30 16:41:50 2008
@@ -326,7 +326,7 @@
 		zoom->timeout_id = 0;
 
 		g_object_unref (zoom->pixbuf);
-		zoom->pixbuf = 0;
+		zoom->pixbuf = NULL;
 
 		g_slice_free (CompositedZoomData, zoom);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]