gimp r26290 - in trunk: . app/widgets libgimpwidgets



Author: neo
Date: Wed Jul 23 07:47:10 2008
New Revision: 26290
URL: http://svn.gnome.org/viewvc/gimp?rev=26290&view=rev

Log:
2008-07-23  Sven Neumann  <sven gimp org>

	* app/widgets/gimpcontrollerinfo.c
	* app/widgets/gimpcontrollerlist.c
	* app/widgets/gimpdasheditor.c
	* app/widgets/gimpdock.c
	* app/widgets/gimpeditor.c
	* app/widgets/gimpgrideditor.c
	* app/widgets/gimppdbdialog.c
	* app/widgets/gimppluginaction.c
	* app/widgets/gimpstrokeeditor.c
	* app/widgets/gimptemplateeditor.c
	* libgimpwidgets/gimpcolorprofilecombobox.c: no need to cast the
	return value of g_value_dup_object().



Modified:
   trunk/ChangeLog
   trunk/app/widgets/gimpcontrollerinfo.c
   trunk/app/widgets/gimpcontrollerlist.c
   trunk/app/widgets/gimpdasheditor.c
   trunk/app/widgets/gimpdock.c
   trunk/app/widgets/gimpeditor.c
   trunk/app/widgets/gimpgrideditor.c
   trunk/app/widgets/gimppdbdialog.c
   trunk/app/widgets/gimppluginaction.c
   trunk/app/widgets/gimpstrokeeditor.c
   trunk/app/widgets/gimptemplateeditor.c
   trunk/libgimpwidgets/gimpcolorprofilecombobox.c

Modified: trunk/app/widgets/gimpcontrollerinfo.c
==============================================================================
--- trunk/app/widgets/gimpcontrollerinfo.c	(original)
+++ trunk/app/widgets/gimpcontrollerinfo.c	Wed Jul 23 07:47:10 2008
@@ -199,17 +199,20 @@
           g_object_unref (info->controller);
         }
 
-      info->controller = GIMP_CONTROLLER (g_value_dup_object (value));
+      info->controller = g_value_dup_object (value);
 
       if (info->controller)
         {
+          GimpControllerClass *controller_class;
+
           g_signal_connect_object (info->controller, "event",
                                    G_CALLBACK (gimp_controller_info_event),
                                    G_OBJECT (info),
                                    0);
 
+          controller_class = GIMP_CONTROLLER_GET_CLASS (info->controller);
           gimp_viewable_set_stock_id (GIMP_VIEWABLE (info),
-                                      GIMP_CONTROLLER_GET_CLASS (info->controller)->stock_id);
+                                      controller_class->stock_id);
         }
       break;
     case PROP_MAPPING:

Modified: trunk/app/widgets/gimpcontrollerlist.c
==============================================================================
--- trunk/app/widgets/gimpcontrollerlist.c	(original)
+++ trunk/app/widgets/gimpcontrollerlist.c	Wed Jul 23 07:47:10 2008
@@ -348,8 +348,9 @@
   switch (property_id)
     {
     case PROP_GIMP:
-      list->gimp = GIMP (g_value_dup_object (value));
+      list->gimp = g_value_dup_object (value);
       break;
+
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
       break;
@@ -369,6 +370,7 @@
     case PROP_GIMP:
       g_value_set_object (value, list->gimp);
       break;
+
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
       break;

Modified: trunk/app/widgets/gimpdasheditor.c
==============================================================================
--- trunk/app/widgets/gimpdasheditor.c	(original)
+++ trunk/app/widgets/gimpdasheditor.c	Wed Jul 23 07:47:10 2008
@@ -170,7 +170,7 @@
     case PROP_STROKE_OPTIONS:
       g_return_if_fail (editor->stroke_options == NULL);
 
-      editor->stroke_options = GIMP_STROKE_OPTIONS (g_value_dup_object (value));
+      editor->stroke_options = g_value_dup_object (value);
       g_signal_connect_object (editor->stroke_options, "notify::dash-info",
                                G_CALLBACK (update_segments_from_options),
                                editor, G_CONNECT_SWAPPED);

Modified: trunk/app/widgets/gimpdock.c
==============================================================================
--- trunk/app/widgets/gimpdock.c	(original)
+++ trunk/app/widgets/gimpdock.c	Wed Jul 23 07:47:10 2008
@@ -225,11 +225,13 @@
   switch (property_id)
     {
     case PROP_CONTEXT:
-      dock->context = GIMP_CONTEXT (g_value_dup_object (value));
+      dock->context = g_value_dup_object (value);
       break;
+
     case PROP_DIALOG_FACTORY:
       dock->dialog_factory = g_value_get_object (value);
       break;
+
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
       break;
@@ -249,9 +251,11 @@
     case PROP_CONTEXT:
       g_value_set_object (value, dock->context);
       break;
+
     case PROP_DIALOG_FACTORY:
       g_value_set_object (value, dock->dialog_factory);
       break;
+
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
       break;

Modified: trunk/app/widgets/gimpeditor.c
==============================================================================
--- trunk/app/widgets/gimpeditor.c	(original)
+++ trunk/app/widgets/gimpeditor.c	Wed Jul 23 07:47:10 2008
@@ -246,23 +246,29 @@
   switch (property_id)
     {
     case PROP_MENU_FACTORY:
-      editor->menu_factory = (GimpMenuFactory *) g_value_dup_object (value);
+      editor->menu_factory = g_value_dup_object (value);
       break;
+
     case PROP_MENU_IDENTIFIER:
       editor->menu_identifier = g_value_dup_string (value);
       break;
+
     case PROP_UI_PATH:
       editor->ui_path = g_value_dup_string (value);
       break;
+
     case PROP_POPUP_DATA:
       editor->popup_data = g_value_get_pointer (value);
       break;
+
     case PROP_SHOW_NAME:
       g_object_set_property (G_OBJECT (editor->name_label), "visible", value);
       break;
+
     case PROP_NAME:
       gimp_editor_set_name (editor, g_value_get_string (value));
       break;
+
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
       break;
@@ -282,18 +288,23 @@
     case PROP_MENU_FACTORY:
       g_value_set_object (value, editor->menu_factory);
       break;
+
     case PROP_MENU_IDENTIFIER:
       g_value_set_string (value, editor->menu_identifier);
       break;
+
     case PROP_UI_PATH:
       g_value_set_string (value, editor->ui_path);
       break;
+
     case PROP_POPUP_DATA:
       g_value_set_pointer (value, editor->popup_data);
       break;
+
     case PROP_SHOW_NAME:
       g_object_get_property (G_OBJECT (editor->name_label), "visible", value);
       break;
+
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
       break;

Modified: trunk/app/widgets/gimpgrideditor.c
==============================================================================
--- trunk/app/widgets/gimpgrideditor.c	(original)
+++ trunk/app/widgets/gimpgrideditor.c	Wed Jul 23 07:47:10 2008
@@ -126,17 +126,21 @@
   switch (property_id)
     {
     case PROP_GRID:
-      editor->grid = GIMP_GRID (g_value_dup_object (value));
+      editor->grid = g_value_dup_object (value);
       break;
+
     case PROP_CONTEXT:
-      editor->context = GIMP_CONTEXT (g_value_dup_object (value));
+      editor->context = g_value_dup_object (value);
       break;
+
     case PROP_XRESOLUTION:
       editor->xresolution = g_value_get_double (value);
       break;
+
     case PROP_YRESOLUTION:
       editor->yresolution = g_value_get_double (value);
       break;
+
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
       break;
@@ -156,15 +160,19 @@
     case PROP_GRID:
       g_value_set_object (value, editor->grid);
       break;
+
     case PROP_CONTEXT:
       g_value_set_object (value, editor->context);
       break;
+
     case PROP_XRESOLUTION:
       g_value_set_double (value, editor->xresolution);
       break;
+
     case PROP_YRESOLUTION:
       g_value_set_double (value, editor->yresolution);
       break;
+
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
       break;

Modified: trunk/app/widgets/gimppdbdialog.c
==============================================================================
--- trunk/app/widgets/gimppdbdialog.c	(original)
+++ trunk/app/widgets/gimppdbdialog.c	Wed Jul 23 07:47:10 2008
@@ -242,11 +242,11 @@
   switch (property_id)
     {
     case PROP_PDB:
-      dialog->pdb = GIMP_PDB (g_value_dup_object (value));
+      dialog->pdb = g_value_dup_object (value);
       break;
 
     case PROP_CONTEXT:
-      dialog->caller_context = GIMP_CONTEXT (g_value_dup_object (value));
+      dialog->caller_context = g_value_dup_object (value);
       break;
 
     case PROP_SELECT_TYPE:
@@ -265,7 +265,7 @@
       break;
 
     case PROP_MENU_FACTORY:
-      dialog->menu_factory = (GimpMenuFactory *) g_value_dup_object (value);
+      dialog->menu_factory = g_value_dup_object (value);
       break;
 
     default:

Modified: trunk/app/widgets/gimppluginaction.c
==============================================================================
--- trunk/app/widgets/gimppluginaction.c	(original)
+++ trunk/app/widgets/gimppluginaction.c	Wed Jul 23 07:47:10 2008
@@ -150,7 +150,7 @@
     case PROP_PROCEDURE:
       if (action->procedure)
         g_object_unref (action->procedure);
-      action->procedure = GIMP_PLUG_IN_PROCEDURE (g_value_dup_object (value));
+      action->procedure = g_value_dup_object (value);
       break;
 
     default:

Modified: trunk/app/widgets/gimpstrokeeditor.c
==============================================================================
--- trunk/app/widgets/gimpstrokeeditor.c	(original)
+++ trunk/app/widgets/gimpstrokeeditor.c	Wed Jul 23 07:47:10 2008
@@ -113,7 +113,7 @@
     case PROP_OPTIONS:
       if (editor->options)
         g_object_unref (editor->options);
-      editor->options = GIMP_STROKE_OPTIONS (g_value_dup_object (value));
+      editor->options = g_value_dup_object (value);
       break;
 
     case PROP_RESOLUTION:

Modified: trunk/app/widgets/gimptemplateeditor.c
==============================================================================
--- trunk/app/widgets/gimptemplateeditor.c	(original)
+++ trunk/app/widgets/gimptemplateeditor.c	Wed Jul 23 07:47:10 2008
@@ -437,8 +437,9 @@
   switch (property_id)
     {
     case PROP_TEMPLATE:
-      editor->template = GIMP_TEMPLATE (g_value_dup_object (value));
+      editor->template = g_value_dup_object (value);
       break;
+
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
       break;
@@ -458,6 +459,7 @@
     case PROP_TEMPLATE:
       g_value_set_object (value, editor->template);
       break;
+
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
       break;

Modified: trunk/libgimpwidgets/gimpcolorprofilecombobox.c
==============================================================================
--- trunk/libgimpwidgets/gimpcolorprofilecombobox.c	(original)
+++ trunk/libgimpwidgets/gimpcolorprofilecombobox.c	Wed Jul 23 07:47:10 2008
@@ -169,7 +169,7 @@
     {
     case PROP_DIALOG:
       g_return_if_fail (combo_box->dialog == NULL);
-      combo_box->dialog = (GtkWidget *) g_value_dup_object (value);
+      combo_box->dialog = g_value_dup_object (value);
       break;
 
     case PROP_MODEL:



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]