← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/gimp/oneiric-security

« back to all changes in this revision

Viewing changes to app/core/gimpmarshal.c

  • Committer: Bazaar Package Importer
  • Author(s): Pedro Fragoso
  • Date: 2008-11-24 14:16:39 UTC
  • mfrom: (1.1.17 upstream)
  • Revision ID: james.westby@ubuntu.com-20081124141639-12b1g29vvadd5pzp
Tags: 2.6.3-1ubuntu1
https://launchpad.net/bugs/301724
* Sync with Debian experimental (LP: #301724)
* debian/patches/02_help-message.patch,
  debian/patches/03_gimp.desktop.in.in.patch:
  - updated some strings for ubuntu
* debian/rules:
  - updated translation templates
* debian/control:
  - Drop webkit build dependency. gimp is the only thing pulling
    in webkit for the desktop CDs, and makes them explode
    Without the webkit help browser
    plugin, help will just be displayed in the default browser.

Show diffs side-by-side

added added

removed removed

Lines of Context:
app/core/gimpmarshal.c
616
616
 
617
617
/* VOID:OBJECT (./gimpmarshal.list:46) */
618
618
 
619
 
/* VOID:OBJECT,INT (./gimpmarshal.list:47) */
 
619
/* VOID:OBJECT,BOOLEAN (./gimpmarshal.list:47) */
 
620
void
 
621
gimp_marshal_VOID__OBJECT_BOOLEAN (GClosure     *closure,
 
622
                                   GValue       *return_value G_GNUC_UNUSED,
 
623
                                   guint         n_param_values,
 
624
                                   const GValue *param_values,
 
625
                                   gpointer      invocation_hint G_GNUC_UNUSED,
 
626
                                   gpointer      marshal_data)
 
627
{
 
628
  typedef void (*GMarshalFunc_VOID__OBJECT_BOOLEAN) (gpointer     data1,
 
629
                                                     gpointer     arg_1,
 
630
                                                     gboolean     arg_2,
 
631
                                                     gpointer     data2);
 
632
  register GMarshalFunc_VOID__OBJECT_BOOLEAN callback;
 
633
  register GCClosure *cc = (GCClosure*) closure;
 
634
  register gpointer data1, data2;
 
635
 
 
636
  g_return_if_fail (n_param_values == 3);
 
637
 
 
638
  if (G_CCLOSURE_SWAP_DATA (closure))
 
639
    {
 
640
      data1 = closure->data;
 
641
      data2 = g_value_peek_pointer (param_values + 0);
 
642
    }
 
643
  else
 
644
    {
 
645
      data1 = g_value_peek_pointer (param_values + 0);
 
646
      data2 = closure->data;
 
647
    }
 
648
  callback = (GMarshalFunc_VOID__OBJECT_BOOLEAN) (marshal_data ? marshal_data : cc->callback);
 
649
 
 
650
  callback (data1,
 
651
            g_marshal_value_peek_object (param_values + 1),
 
652
            g_marshal_value_peek_boolean (param_values + 2),
 
653
            data2);
 
654
}
 
655
 
 
656
/* VOID:OBJECT,INT (./gimpmarshal.list:48) */
620
657
void
621
658
gimp_marshal_VOID__OBJECT_INT (GClosure     *closure,
622
659
                               GValue       *return_value G_GNUC_UNUSED,
653
690
            data2);
654
691
}
655
692
 
656
 
/* VOID:OBJECT,OBJECT (./gimpmarshal.list:48) */
 
693
/* VOID:OBJECT,OBJECT (./gimpmarshal.list:49) */
657
694
void
658
695
gimp_marshal_VOID__OBJECT_OBJECT (GClosure     *closure,
659
696
                                  GValue       *return_value G_GNUC_UNUSED,
690
727
            data2);
691
728
}
692
729
 
693
 
/* VOID:OBJECT,POINTER (./gimpmarshal.list:49) */
 
730
/* VOID:OBJECT,POINTER (./gimpmarshal.list:50) */
694
731
void
695
732
gimp_marshal_VOID__OBJECT_POINTER (GClosure     *closure,
696
733
                                   GValue       *return_value G_GNUC_UNUSED,
727
764
            data2);
728
765
}
729
766
 
730
 
/* VOID:POINTER (./gimpmarshal.list:50) */
 
767
/* VOID:POINTER (./gimpmarshal.list:51) */
731
768
 
732
 
/* VOID:POINTER,BOXED (./gimpmarshal.list:51) */
 
769
/* VOID:POINTER,BOXED (./gimpmarshal.list:52) */
733
770
void
734
771
gimp_marshal_VOID__POINTER_BOXED (GClosure     *closure,
735
772
                                  GValue       *return_value G_GNUC_UNUSED,
766
803
            data2);
767
804
}
768
805
 
769
 
/* VOID:POINTER,ENUM (./gimpmarshal.list:52) */
 
806
/* VOID:POINTER,ENUM (./gimpmarshal.list:53) */
770
807
void
771
808
gimp_marshal_VOID__POINTER_ENUM (GClosure     *closure,
772
809
                                 GValue       *return_value G_GNUC_UNUSED,
803
840
            data2);
804
841
}
805
842
 
806
 
/* VOID:STRING (./gimpmarshal.list:53) */
 
843
/* VOID:STRING (./gimpmarshal.list:54) */
807
844
 
808
 
/* VOID:STRING,BOOLEAN,UINT,FLAGS (./gimpmarshal.list:54) */
 
845
/* VOID:STRING,BOOLEAN,UINT,FLAGS (./gimpmarshal.list:55) */
809
846
void
810
847
gimp_marshal_VOID__STRING_BOOLEAN_UINT_FLAGS (GClosure     *closure,
811
848
                                              GValue       *return_value G_GNUC_UNUSED,
846
883
            data2);
847
884
}
848
885
 
849
 
/* VOID:STRING,FLAGS (./gimpmarshal.list:55) */
 
886
/* VOID:STRING,FLAGS (./gimpmarshal.list:56) */
850
887
void
851
888
gimp_marshal_VOID__STRING_FLAGS (GClosure     *closure,
852
889
                                 GValue       *return_value G_GNUC_UNUSED,
883
920
            data2);
884
921
}
885
922
 
886
 
/* VOID:STRING,STRING,STRING (./gimpmarshal.list:56) */
 
923
/* VOID:STRING,STRING,STRING (./gimpmarshal.list:57) */
887
924
void
888
925
gimp_marshal_VOID__STRING_STRING_STRING (GClosure     *closure,
889
926
                                         GValue       *return_value G_GNUC_UNUSED,
922
959
            data2);
923
960
}
924
961
 
925
 
/* VOID:VOID (./gimpmarshal.list:57) */
 
962
/* VOID:VOID (./gimpmarshal.list:58) */
926
963