diff options
| author | Vadim Barkov <[email protected]> | 2016-12-19 23:24:10 +0300 |
|---|---|---|
| committer | Vadim Barkov <[email protected]> | 2016-12-19 23:24:10 +0300 |
| commit | 98c44e3c9455581f90c4f6a70fc42adf986d8206 (patch) | |
| tree | e9de2a70895a7f28d47eb12b12f9e3d33c64faa3 /pluma/pluma-utils.c | |
| parent | 2314b3828cbe540d65ba517c32872476417501a6 (diff) | |
| parent | 38c20e460232c5f4ec7bf616180ff777b5d6b3a0 (diff) | |
| download | pluma-98c44e3c9455581f90c4f6a70fc42adf986d8206.tar.bz2 pluma-98c44e3c9455581f90c4f6a70fc42adf986d8206.tar.xz | |
Merge branch 'master' of https://github.com/mate-desktop/pluma
Diffstat (limited to 'pluma/pluma-utils.c')
| -rw-r--r-- | pluma/pluma-utils.c | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/pluma/pluma-utils.c b/pluma/pluma-utils.c index 868a5bd8..ff872e09 100644 --- a/pluma/pluma-utils.c +++ b/pluma/pluma-utils.c @@ -202,15 +202,13 @@ pluma_utils_menu_position_under_tree_view (GtkMenu *menu, } } -/* FIXME: remove this with gtk 2.12, it has gdk_color_to_string */ -gchar * -pluma_gdk_color_to_string (GdkColor color) -{ - return g_strdup_printf ("#%04x%04x%04x", - color.red, - color.green, - color.blue); -} +/** + * pluma_gtk_button_new_with_stock_icon: + * @label: + * @stock_id: + * + * Returns: (transfer full): + */ GtkWidget * pluma_gtk_button_new_with_stock_icon (const gchar *label, @@ -226,6 +224,15 @@ pluma_gtk_button_new_with_stock_icon (const gchar *label, return button; } +/** + * pluma_dialog_add_button: + * @dialog: + * @text: + * @stock_id: + * @response_id: + * + * Returns: (transfer none): + */ GtkWidget * pluma_dialog_add_button (GtkDialog *dialog, const gchar *text, @@ -1383,7 +1390,7 @@ pluma_utils_uri_for_display (const gchar *uri) * * Create a list of valid uri's from a uri-list drop. * - * Return value: a string array which will hold the uris or %NULL if there + * Return value: (transfer full): a string array which will hold the uris or %NULL if there * were no valid uris. g_strfreev should be used when the * string array is no longer used */ |