quick-lounge-applet r229 - in trunk: . data/ui src
- From: paobac svn gnome org
- To: svn-commits-list gnome org
- Subject: quick-lounge-applet r229 - in trunk: . data/ui src
- Date: Fri, 30 Jan 2009 21:10:14 +0000 (UTC)
Author: paobac
Date: Fri Jan 30 21:10:14 2009
New Revision: 229
URL: http://svn.gnome.org/viewvc/quick-lounge-applet?rev=229&view=rev
Log:
2009-01-30 Paolo Bacchilega <paobac svn gnome org>
* configure.ac:
* configure.in: renamed .in as .ac
* data/ui/properties.ui:
* data/ui/choose-from-menu.ui:
* src/Makefile.am: fixed loading of the ui.
Added:
trunk/configure.ac (contents, props changed)
- copied, changed from r228, /trunk/configure.in
Removed:
trunk/configure.in
Modified:
trunk/ChangeLog
trunk/data/ui/choose-from-menu.ui
trunk/data/ui/properties.ui
trunk/src/Makefile.am
trunk/src/gtk-utils.c
trunk/src/quick-lounge.c
Copied: trunk/configure.ac (from r228, /trunk/configure.in)
==============================================================================
--- /trunk/configure.in (original)
+++ trunk/configure.ac Fri Jan 30 21:10:14 2009
@@ -1,13 +1,19 @@
-AC_PREREQ(2.52)
-
AC_INIT([quick-lounge-applet],[2.13.0],[http://bugzilla.gnome.org/enter_bug.cgi?product=quick-lounge-applet])
+GNOME_COMMON_INIT
+
+AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_HEADERS([config.h])
AC_CONFIG_SRCDIR(src/quick-lounge.c)
AM_INIT_AUTOMAKE([1.9 foreign no-dist-gzip dist-bzip2])
-AC_CONFIG_HEADERS([config.h])
+
+AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
+AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums)
AM_PROG_LIBTOOL
+GNOME_DOC_INIT
+GNOME_COMPILE_WARNINGS([maximum])
dnl ==========================================================================
dnl
@@ -34,10 +40,6 @@
dnl ==========================================================================
-AC_DEFINE_UNQUOTED(UI_DIR, ["$datadir/quick-lounge-applet/ui"], [ui data directory])
-
-dnl ==========================================================================
-
PKG_CHECK_MODULES(QL, \
glib-2.0 >= $GLIB_REQUIRED \
gthread-2.0 \
@@ -50,13 +52,6 @@
AC_SUBST(QL_CFLAGS)
AC_SUBST(QL_LIBS)
-
-dnl ******************************
-
-GNOME_COMMON_INIT
-GNOME_COMPILE_WARNINGS([maximum])
-GNOME_MAINTAINER_MODE_DEFINES
-
dnl ******************************
AC_ARG_ENABLE(deprecations,AC_HELP_STRING([--enable-deprecations],[warn about deprecated usages]))
Modified: trunk/data/ui/choose-from-menu.ui
==============================================================================
--- trunk/data/ui/choose-from-menu.ui (original)
+++ trunk/data/ui/choose-from-menu.ui Fri Jan 30 21:10:14 2009
@@ -1,623 +1,7 @@
<?xml version="1.0"?>
<interface>
- <requires lib="gtk+" version="2.16"/>
+ <requires lib="gtk+" version="2.15"/>
<!-- interface-naming-policy toplevel-contextual -->
- <object class="GtkDialog" id="properties_dialog">
- <property name="border_width">6</property>
- <property name="title" translatable="yes">Launchers List Preferences</property>
- <property name="window_position">center</property>
- <property name="type_hint">normal</property>
- <property name="gravity">center</property>
- <property name="has_separator">False</property>
- <child internal-child="vbox">
- <object class="GtkVBox" id="dialog-vbox1">
- <property name="visible">True</property>
- <property name="spacing">8</property>
- <child>
- <object class="GtkVBox" id="vbox1">
- <property name="visible">True</property>
- <property name="border_width">6</property>
- <property name="spacing">10</property>
- <child>
- <object class="GtkVBox" id="vbox6">
- <property name="visible">True</property>
- <property name="spacing">5</property>
- <child>
- <object class="GtkLabel" id="label10">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Launchers</b></property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox10">
- <property name="visible">True</property>
- <child>
- <object class="GtkLabel" id="label9">
- <property name="visible">True</property>
- <property name="label" translatable="yes"> </property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkTable" id="table2">
- <property name="visible">True</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">12</property>
- <property name="row_spacing">6</property>
- <child>
- <object class="GtkScrolledWindow" id="p_apps_scrolledwindow">
- <property name="width_request">260</property>
- <property name="height_request">260</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
- <property name="shadow_type">in</property>
- <child>
- <object class="GtkTreeView" id="p_apps_treeview">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="headers_visible">False</property>
- <property name="enable_search">False</property>
- </object>
- </child>
- </object>
- </child>
- <child>
- <object class="GtkVBox" id="vbox4">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkButton" id="p_add_from_menu_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <child>
- <object class="GtkAlignment" id="alignment2">
- <property name="visible">True</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <object class="GtkHBox" id="hbox17">
- <property name="visible">True</property>
- <property name="spacing">2</property>
- <child>
- <object class="GtkImage" id="image10">
- <property name="visible">True</property>
- <property name="stock">gtk-add</property>
- <property name="icon-size">4</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label15">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Add _Existing Launcher</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="p_add_space_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <child>
- <object class="GtkAlignment" id="alignment1">
- <property name="visible">True</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <object class="GtkHBox" id="hbox16">
- <property name="visible">True</property>
- <property name="spacing">2</property>
- <child>
- <object class="GtkImage" id="image9">
- <property name="visible">True</property>
- <property name="stock">gtk-add</property>
- <property name="icon-size">4</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label14">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Add _Space</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="p_add_launcher_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <child>
- <object class="GtkAlignment" id="alignment3">
- <property name="visible">True</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <object class="GtkHBox" id="hbox18">
- <property name="visible">True</property>
- <property name="spacing">2</property>
- <child>
- <object class="GtkImage" id="image11">
- <property name="visible">True</property>
- <property name="stock">gtk-new</property>
- <property name="icon-size">4</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label18">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Add _New Launcher</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">5</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="p_edit_button">
- <property name="label">gtk-properties</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="p_delete_button">
- <property name="label">gtk-remove</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox4">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <property name="homogeneous">True</property>
- <child>
- <object class="GtkButton" id="p_top_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <child>
- <object class="GtkImage" id="image4">
- <property name="visible">True</property>
- <property name="stock">gtk-goto-top</property>
- <property name="icon-size">4</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="p_up_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <child>
- <object class="GtkImage" id="image5">
- <property name="visible">True</property>
- <property name="stock">gtk-go-up</property>
- <property name="icon-size">4</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="p_down_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <child>
- <object class="GtkImage" id="image6">
- <property name="visible">True</property>
- <property name="stock">gtk-go-down</property>
- <property name="icon-size">4</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="p_bottom_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <child>
- <object class="GtkImage" id="image7">
- <property name="visible">True</property>
- <property name="stock">gtk-goto-bottom</property>
- <property name="icon-size">4</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="position">3</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkVBox" id="vbox7">
- <property name="visible">True</property>
- <property name="spacing">5</property>
- <child>
- <object class="GtkLabel" id="label12">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Size</b></property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox11">
- <property name="visible">True</property>
- <child>
- <object class="GtkLabel" id="label11">
- <property name="visible">True</property>
- <property name="label" translatable="yes"> </property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkVBox" id="vbox5">
- <property name="visible">True</property>
- <property name="spacing">5</property>
- <child>
- <object class="GtkTable" id="table3">
- <property name="visible">True</property>
- <property name="n_rows">2</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">12</property>
- <property name="row_spacing">6</property>
- <child>
- <object class="GtkHBox" id="hbox9">
- <property name="visible">True</property>
- <child>
- <object class="GtkHBox" id="hbox14">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkSpinButton" id="p_minsize_spinbutton">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment"></property>
- <property name="climb_rate">1</property>
- </object>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label6">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">columns</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox8">
- <property name="visible">True</property>
- <child>
- <object class="GtkHBox" id="hbox15">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkSpinButton" id="p_maxsize_spinbutton">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment"></property>
- <property name="climb_rate">1</property>
- </object>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label8">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">columns</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label4">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Minimum size:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">p_minsize_spinbutton</property>
- </object>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label7">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Ma_ximum size:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">p_maxsize_spinbutton</property>
- </object>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="p_icon_size_checkbutton">
- <property name="label" translatable="yes">Always use one row</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child internal-child="action_area">
- <object class="GtkHButtonBox" id="dialog-action_area1">
- <property name="visible">True</property>
- <property name="layout_style">end</property>
- <child>
- <object class="GtkButton" id="p_help_button">
- <property name="label">gtk-help</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="p_close_button">
- <property name="label">gtk-close</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- </child>
- <action-widgets>
- <action-widget response="-11">p_help_button</action-widget>
- <action-widget response="-7">p_close_button</action-widget>
- </action-widgets>
- </object>
<object class="GtkDialog" id="from_menu_dialog">
<property name="border_width">6</property>
<property name="title" translatable="yes">Add Existing Launcher</property>
@@ -721,6 +105,7 @@
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
+ <property name="response_id">0</property>
</object>
<packing>
<property name="expand">False</property>
@@ -736,6 +121,7 @@
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
+ <property name="response_id">0</property>
</object>
<packing>
<property name="expand">False</property>
@@ -751,6 +137,7 @@
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
+ <property name="response_id">0</property>
</object>
<packing>
<property name="expand">False</property>
@@ -767,10 +154,5 @@
</child>
</object>
</child>
- <action-widgets>
- <action-widget response="-11">fm_help_button</action-widget>
- <action-widget response="-6">fm_cancel_button</action-widget>
- <action-widget response="-5">fm_ok_button</action-widget>
- </action-widgets>
</object>
</interface>
Modified: trunk/data/ui/properties.ui
==============================================================================
--- trunk/data/ui/properties.ui (original)
+++ trunk/data/ui/properties.ui Fri Jan 30 21:10:14 2009
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<interface>
- <requires lib="gtk+" version="2.16"/>
+ <requires lib="gtk+" version="2.15"/>
<!-- interface-naming-policy toplevel-contextual -->
<object class="GtkDialog" id="properties_dialog">
<property name="border_width">6</property>
@@ -419,7 +419,6 @@
<object class="GtkSpinButton" id="p_minsize_spinbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="adjustment"></property>
<property name="climb_rate">1</property>
</object>
<packing>
@@ -464,7 +463,6 @@
<object class="GtkSpinButton" id="p_maxsize_spinbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="adjustment"></property>
<property name="climb_rate">1</property>
</object>
<packing>
@@ -582,11 +580,13 @@
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
+ <property name="response_id">0</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
+ <property name="secondary">True</property>
</packing>
</child>
<child>
@@ -597,6 +597,7 @@
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
+ <property name="response_id">0</property>
</object>
<packing>
<property name="expand">False</property>
@@ -613,164 +614,5 @@
</child>
</object>
</child>
- <action-widgets>
- <action-widget response="-11">p_help_button</action-widget>
- <action-widget response="-7">p_close_button</action-widget>
- </action-widgets>
- </object>
- <object class="GtkDialog" id="from_menu_dialog">
- <property name="border_width">6</property>
- <property name="title" translatable="yes">Add Existing Launcher</property>
- <property name="window_position">center</property>
- <property name="type_hint">normal</property>
- <property name="has_separator">False</property>
- <child internal-child="vbox">
- <object class="GtkVBox" id="dialog-vbox2">
- <property name="visible">True</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkVBox" id="vbox8">
- <property name="visible">True</property>
- <property name="border_width">6</property>
- <property name="spacing">5</property>
- <child>
- <object class="GtkLabel" id="label17">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Available applications:</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkScrolledWindow" id="scrolledwindow2">
- <property name="width_request">600</property>
- <property name="height_request">300</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
- <property name="shadow_type">in</property>
- <child>
- <object class="GtkTreeView" id="fm_treeview">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="enable_search">False</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox13">
- <property name="visible">True</property>
- <property name="spacing">5</property>
- <child>
- <object class="GtkButton" id="fm_expand_button">
- <property name="label" translatable="yes">E_xpand All</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="fm_collapse_button">
- <property name="label" translatable="yes">Collap_se All</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child internal-child="action_area">
- <object class="GtkHButtonBox" id="dialog-action_area2">
- <property name="visible">True</property>
- <property name="layout_style">end</property>
- <child>
- <object class="GtkButton" id="fm_help_button">
- <property name="label">gtk-help</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="fm_cancel_button">
- <property name="label">gtk-cancel</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="fm_ok_button">
- <property name="label">gtk-add</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- </child>
- <action-widgets>
- <action-widget response="-11">fm_help_button</action-widget>
- <action-widget response="-6">fm_cancel_button</action-widget>
- <action-widget response="-5">fm_ok_button</action-widget>
- </action-widgets>
</object>
</interface>
Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am (original)
+++ trunk/src/Makefile.am Fri Jan 30 21:10:14 2009
@@ -2,10 +2,11 @@
-I$(top_srcdir) \
-I$(top_builddir) \
-DPREFIX=\"$(prefix)\" \
- -DSYSCONFDIR=\"$(sysconfdir)\" \
- -DDATADIR=\"$(datadir)\" \
- -DLIBDIR=\"$(libdir)\" \
+ -DSYSCONFDIR=\"$(sysconfdir)\" \
+ -DDATADIR=\"$(datadir)\" \
+ -DLIBDIR=\"$(libdir)\" \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
+ -DUI_DIR=\"$(datadir)/quick-lounge-applet/ui\" \
-DGMENU_I_KNOW_THIS_IS_UNSTABLE \
$(DISABLE_DEPRECATED) \
$(QL_CFLAGS)
Modified: trunk/src/gtk-utils.c
==============================================================================
--- trunk/src/gtk-utils.c (original)
+++ trunk/src/gtk-utils.c Fri Jan 30 21:10:14 2009
@@ -55,7 +55,7 @@
static GtkWidget *
-create_button (const char *stock_id,
+create_button (const char *stock_id,
const char *text)
{
GtkWidget *button;
@@ -136,7 +136,7 @@
image = gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_DIALOG);
gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0);
- label = gtk_label_new (message);
+ label = gtk_label_new (message);
gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
gtk_label_set_selectable (GTK_LABEL (label), TRUE);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
@@ -162,30 +162,30 @@
gtk_box_pack_start (GTK_BOX (vbox), entry,
FALSE, FALSE, 0);
-
+
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (d)->vbox),
vbox,
FALSE, FALSE, 0);
-
+
gtk_widget_show_all (vbox);
-
+
/* Add buttons */
button = create_button (GTK_STOCK_CANCEL, no_button_text);
- gtk_dialog_add_action_widget (GTK_DIALOG (d),
- button,
+ gtk_dialog_add_action_widget (GTK_DIALOG (d),
+ button,
GTK_RESPONSE_CANCEL);
/**/
button = create_button (GTK_STOCK_OK, yes_button_text);
- gtk_dialog_add_action_widget (GTK_DIALOG (d),
+ gtk_dialog_add_action_widget (GTK_DIALOG (d),
button,
GTK_RESPONSE_YES);
/**/
- gtk_dialog_set_default_response (GTK_DIALOG (d),
+ gtk_dialog_set_default_response (GTK_DIALOG (d),
GTK_RESPONSE_YES);
gtk_widget_grab_focus (entry);
@@ -209,9 +209,9 @@
GError **gerror)
{
GtkWidget *d;
-
+
g_return_if_fail (*gerror != NULL);
-
+
d = gtk_message_dialog_new (parent,
GTK_DIALOG_MODAL,
GTK_MESSAGE_ERROR,
@@ -360,7 +360,7 @@
return g_strdup (icon_name);
} else {
char *basename;
-
+
basename = g_path_get_basename (icon_name);
retval = panel_find_icon (icon_theme, basename,
size);
@@ -381,17 +381,17 @@
*p = 0;
}
- icon_info = gtk_icon_theme_lookup_icon (icon_theme,
- icon_no_extension,
- size,
+ icon_info = gtk_icon_theme_lookup_icon (icon_theme,
+ icon_no_extension,
+ size,
0);
-
+
g_free (icon_no_extension);
if (icon_info) {
retval = g_strdup (gtk_icon_info_get_filename (icon_info));
gtk_icon_info_free (icon_info);
-
+
} else
retval = NULL;
@@ -417,7 +417,7 @@
g_free (icon_path);
- if (pixbuf == NULL)
+ if (pixbuf == NULL)
return NULL;
iw = gdk_pixbuf_get_width (pixbuf);
@@ -428,11 +428,11 @@
gdouble factor;
gdouble max = icon_size;
int new_w, new_h;
-
+
factor = MIN (max / iw, max / ih);
new_w = MAX ((int) (iw * factor), 1);
new_h = MAX ((int) (ih * factor), 1);
-
+
scaled = gdk_pixbuf_scale_simple (pixbuf,
new_w,
new_h,
@@ -454,14 +454,14 @@
GdkPixbuf *pixbuf;
pixbuf = create_pixbuf (icon_theme, icon_path, icon_size);
-
+
if (pixbuf == NULL)
return NULL;
icon = gtk_image_new ();
gtk_image_set_from_pixbuf (GTK_IMAGE (icon), pixbuf);
g_object_unref (pixbuf);
-
+
gtk_widget_show (icon);
return icon;
@@ -512,7 +512,7 @@
}
-GtkBuilder *
+GtkBuilder *
_gtk_builder_new_from_file (const char *ui_file)
{
char *filename;
@@ -520,18 +520,18 @@
GError *error = NULL;
filename = g_build_filename (UI_DIR, ui_file, NULL);
- builder = gtk_builder_new ();
+ builder = gtk_builder_new ();
if (! gtk_builder_add_from_file (builder, filename, &error)) {
g_warning ("%s\n", error->message);
g_clear_error (&error);
}
g_free (filename);
-
+
return builder;
}
-GtkWidget *
+GtkWidget *
_gtk_builder_get_widget (GtkBuilder *builder,
const char *name)
{
Modified: trunk/src/quick-lounge.c
==============================================================================
--- trunk/src/quick-lounge.c (original)
+++ trunk/src/quick-lounge.c Fri Jan 30 21:10:14 2009
@@ -68,7 +68,7 @@
};
static void
-destroy_prop_dlg_cb (GtkWidget *widget,
+destroy_prop_dlg_cb (GtkWidget *widget,
QuickLounge *quick_lounge)
{
quick_lounge->prop_dialog = NULL;
@@ -81,9 +81,9 @@
const gchar *verbname)
{
if (quick_lounge->prop_dialog == NULL) {
- quick_lounge->prop_dialog = dlg_properties (quick_lounge,
+ quick_lounge->prop_dialog = dlg_properties (quick_lounge,
NULL);
- g_signal_connect (G_OBJECT (quick_lounge->prop_dialog),
+ g_signal_connect (G_OBJECT (quick_lounge->prop_dialog),
"destroy",
G_CALLBACK (destroy_prop_dlg_cb),
quick_lounge);
@@ -107,16 +107,16 @@
gnome_help_display_desktop_on_screen (
NULL,
- "quick-lounge",
- "quick-lounge",
- NULL,
+ "quick-lounge",
+ "quick-lounge",
+ NULL,
gtk_widget_get_screen (GTK_WIDGET (quick_lounge->applet)),
&error);
- if (error) {
- _gtk_error_dialog_run (NULL,
- ERROR_FORMAT,
- _("Could not display help"),
+ if (error) {
+ _gtk_error_dialog_run (NULL,
+ ERROR_FORMAT,
+ _("Could not display help"),
error->message);
g_error_free (error);
}
@@ -148,7 +148,7 @@
about_dialog = gtk_about_dialog_new ();
- g_object_set (about_dialog,
+ g_object_set (about_dialog,
"name", _("Launchers List"),
"version", VERSION,
"copyright", "Copyright \xc2\xa9 2002-2008 Free Software Foundation, Inc.",
@@ -159,7 +159,7 @@
"logo-icon-name", "quick-lounge-applet",
NULL);
- gtk_window_set_wmclass (GTK_WINDOW (about_dialog), "quick-lounge-applet", "Quick-lounge-applet");
+ 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);
g_signal_connect (about_dialog, "response", G_CALLBACK (gtk_widget_destroy), NULL);
@@ -184,7 +184,7 @@
static void
-applet_destroy (GtkWidget *applet,
+applet_destroy (GtkWidget *applet,
QuickLounge *quick_lounge)
{
/* free memory */
@@ -195,7 +195,7 @@
g_free (quick_lounge->location);
if (quick_lounge->ditem_hash != NULL) {
- g_hash_table_foreach (quick_lounge->ditem_hash,
+ g_hash_table_foreach (quick_lounge->ditem_hash,
gh_desktop_item_unref,
NULL);
g_hash_table_destroy (quick_lounge->ditem_hash);
@@ -241,20 +241,20 @@
/* taken from the Trash Applet */
GtkRcStyle *rc_style;
GtkStyle *style;
-
+
/* reset style */
gtk_widget_set_style (GTK_WIDGET (applet), NULL);
rc_style = gtk_rc_style_new ();
gtk_widget_modify_style (GTK_WIDGET (applet), rc_style);
- gtk_rc_style_unref (rc_style);
-
+ gtk_rc_style_unref (rc_style);
+
switch (type) {
case PANEL_COLOR_BACKGROUND:
gtk_widget_modify_bg (GTK_WIDGET (applet),
- GTK_STATE_NORMAL,
+ GTK_STATE_NORMAL,
color);
break;
-
+
case PANEL_PIXMAP_BACKGROUND:
style = gtk_style_copy (GTK_WIDGET (applet)->style);
if (style->bg_pixmap[GTK_STATE_NORMAL] != NULL)
@@ -263,7 +263,7 @@
gtk_widget_set_style (GTK_WIDGET (applet), style);
g_object_unref (style);
break;
-
+
case PANEL_NO_BACKGROUND:
default:
break;
@@ -283,8 +283,8 @@
gtk_widget_get_child_requisition (quick_lounge->applet, &child_req);
size_hints = quick_box_get_size_hint_list (quick_lounge->quick_box, &len);
panel_applet_set_size_hints (PANEL_APPLET (quick_lounge->applet),
- size_hints,
- len,
+ size_hints,
+ len,
child_req.width);
}
@@ -345,7 +345,7 @@
ditem = gnome_ditem_edit_get_ditem (dedit);
gnome_desktop_item_set_location (ditem, gnome_desktop_item_get_location (orig_ditem));
gnome_desktop_item_save (ditem, uri, TRUE, &error);
-
+
/* save the error for later */
if (error != NULL) {
@@ -353,7 +353,7 @@
g_strdup (error->message),
(GDestroyNotify) g_free);
g_clear_error (&error);
- } else
+ } else
g_object_set_data (G_OBJECT (dedit), "SavingError", NULL);
/* update */
@@ -371,15 +371,15 @@
static void
-ditem_properties_clicked (GtkWidget *w,
- int response,
+ditem_properties_clicked (GtkWidget *w,
+ int response,
gpointer data)
{
GtkWidget *dialog = data;
if (response == GTK_RESPONSE_HELP) {
GError *error = NULL;
-
+
gnome_help_display_desktop_on_screen (NULL,
"user-guide",
"user-guide.xml",
@@ -398,7 +398,7 @@
gtk_dialog_run (GTK_DIALOG (message_dialog));
gtk_widget_destroy (message_dialog);
}
- } else if (response == REVERT_BUTTON) {
+ } else if (response == REVERT_BUTTON) {
QuickButton *button;
GnomeDItemEdit *dedit;
GtkWidget *revert_button;
@@ -425,13 +425,13 @@
revert_button = g_object_get_data (G_OBJECT (dialog), "revert_button");
gtk_widget_set_sensitive (revert_button, FALSE);
- } else if (response == GTK_RESPONSE_CLOSE)
+ } else if (response == GTK_RESPONSE_CLOSE)
gtk_widget_destroy (dialog);
}
static void
-ditem_properties_changed (GtkWidget *dedit,
+ditem_properties_changed (GtkWidget *dedit,
gpointer data)
{
GtkWidget *dialog = data;
@@ -451,7 +451,7 @@
ditem_properties_apply_timeout,
dialog);
- g_object_set_data (G_OBJECT (dedit),
+ g_object_set_data (G_OBJECT (dedit),
"apply_timeout",
GUINT_TO_POINTER (timeout));
}
@@ -487,10 +487,10 @@
}
saving_error = g_object_get_data (G_OBJECT (dedit), "SavingError");
- if (saving_error != NULL)
- _gtk_error_dialog_run (NULL,
+ if (saving_error != NULL)
+ _gtk_error_dialog_run (NULL,
_("Cannot save changes to launcher\n\n"
- "Details: %s"),
+ "Details: %s"),
saving_error);
gnome_ditem_edit_clear (dedit);
@@ -544,14 +544,14 @@
g_object_set_data (G_OBJECT (dialog), "revert_ditem", revert_ditem);
g_signal_connect (dedit, "changed",
- G_CALLBACK (ditem_properties_changed),
+ G_CALLBACK (ditem_properties_changed),
dialog);
g_signal_connect (G_OBJECT (dialog), "response",
G_CALLBACK (ditem_properties_clicked),
dialog);
g_signal_connect (G_OBJECT (dialog), "destroy",
- G_CALLBACK (ditem_properties_close),
+ G_CALLBACK (ditem_properties_close),
dialog);
gtk_widget_set_sensitive (revert_button, FALSE);
@@ -567,13 +567,13 @@
const char *uri;
QuickLounge *quick_lounge;
- quick_lounge = g_object_get_data (G_OBJECT (quick_box),
+ quick_lounge = g_object_get_data (G_OBJECT (quick_box),
"quick_lounge");
uri = g_object_get_data (G_OBJECT (button), "uri");
if (uri != NULL) {
GFile *file;
-
+
file = g_file_new_for_uri (uri);
g_file_delete (file, NULL, NULL);
g_object_unref (file);
@@ -591,16 +591,16 @@
QuickBox *quick_box = QUICK_BOX (button->parent);
QuickLounge *quick_lounge;
- quick_lounge = g_object_get_data (G_OBJECT (quick_box),
+ quick_lounge = g_object_get_data (G_OBJECT (quick_box),
"quick_lounge");
- if (quick_lounge == NULL)
+ if (quick_lounge == NULL)
return;
-
+
if (quick_lounge->prop_dialog != NULL)
- dlg_properties_select_button (quick_lounge->prop_dialog,
+ dlg_properties_select_button (quick_lounge->prop_dialog,
button);
else {
- quick_lounge->prop_dialog = dlg_properties (quick_lounge,
+ quick_lounge->prop_dialog = dlg_properties (quick_lounge,
button);
g_signal_connect (G_OBJECT (quick_lounge->prop_dialog),
"destroy",
@@ -690,26 +690,26 @@
gtk_dialog_run (GTK_DIALOG (message_dialog));
gtk_widget_destroy (message_dialog);
}
- }
- else if (response == GTK_RESPONSE_OK) {
+ }
+ else if (response == GTK_RESPONSE_OK) {
GnomeDesktopItem *ditem;
char *uri, *path;
GFile *file;
GError *error = NULL;
-
+
uri = quick_lounge_util__get_unique_uri (quick_lounge);
file = g_file_new_for_uri (uri);
path = g_file_get_path (file);
- g_object_unref (file);
+ g_object_unref (file);
ditem = gnome_ditem_edit_get_ditem (dedit);
gnome_desktop_item_set_location_file (ditem, path);
g_free (path);
if (! gnome_desktop_item_save (ditem, NULL, TRUE, &error)) {
- _gtk_error_dialog_run (NULL,
- ERROR_FORMAT,
+ _gtk_error_dialog_run (NULL,
+ ERROR_FORMAT,
_("Could not create the new launcher"),
error->message);
g_free (uri);
@@ -717,7 +717,7 @@
gtk_widget_destroy (dialog);
return;
}
-
+
quick_box_add_button (quick_lounge->quick_box, uri, pos + 1);
g_free (uri);
@@ -725,8 +725,8 @@
dlg_properties_update (quick_lounge->prop_dialog);
gtk_widget_destroy (dialog);
- }
- else if (response == GTK_RESPONSE_CANCEL)
+ }
+ else if (response == GTK_RESPONSE_CANCEL)
gtk_widget_destroy (dialog);
}
@@ -747,12 +747,12 @@
NULL);
gtk_window_set_icon_name (GTK_WINDOW (widget), "quick-lounge-applet");
gtk_window_set_screen (GTK_WINDOW (widget), gtk_widget_get_screen (GTK_WIDGET (quick_lounge->applet)));
-
+
dialog = GTK_DIALOG (widget);
gtk_dialog_set_has_separator (dialog, FALSE);
gtk_dialog_set_default_response (dialog, GTK_RESPONSE_OK);
-
+
dedit = gnome_ditem_edit_new ();
gtk_widget_show (dedit);
@@ -782,7 +782,7 @@
int pos;
quick_lounge = g_object_get_data (G_OBJECT (quick_box), "quick_lounge");
- if (quick_lounge == NULL)
+ if (quick_lounge == NULL)
return;
pos = get_child_position (quick_box, button);
@@ -799,7 +799,7 @@
int pos;
quick_lounge = g_object_get_data (G_OBJECT (quick_box), "quick_lounge");
- if (quick_lounge == NULL)
+ if (quick_lounge == NULL)
return;
pos = get_child_position (quick_box, button);
@@ -815,7 +815,7 @@
int pos;
quick_lounge = g_object_get_data (G_OBJECT (quick_box), "quick_lounge");
- if (quick_lounge == NULL)
+ if (quick_lounge == NULL)
return;
pos = get_child_position (quick_box, button);
@@ -853,36 +853,36 @@
if (quick_lounge == NULL)
return;
- quick_lounge_util__item_properties (quick_lounge, button);
+ quick_lounge_util__item_properties (quick_lounge, button);
}
-
-static void
-populate_context_menu (GtkWidget *popup_menu,
+
+static void
+populate_context_menu (GtkWidget *popup_menu,
GtkWidget *button,
gpointer data)
{
GtkWidget *item;
- if (! QUICK_IS_SEPARATOR (button)) {
+ if (! QUICK_IS_SEPARATOR (button)) {
item = gtk_image_menu_item_new_from_stock (GTK_STOCK_EXECUTE, NULL);
gtk_widget_show_all (item);
gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), item);
- g_signal_connect (G_OBJECT (item),
+ g_signal_connect (G_OBJECT (item),
"activate",
- G_CALLBACK (execute_item_activate_cb),
+ G_CALLBACK (execute_item_activate_cb),
button);
item = gtk_image_menu_item_new_from_stock (GTK_STOCK_PROPERTIES, NULL);
gtk_widget_show_all (item);
gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), item);
- g_signal_connect (G_OBJECT (item),
+ g_signal_connect (G_OBJECT (item),
"activate",
- G_CALLBACK (properties_activate_cb),
+ G_CALLBACK (properties_activate_cb),
button);
/**/
-
+
item = gtk_separator_menu_item_new ();
gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), item);
gtk_widget_show_all (item);
@@ -895,9 +895,9 @@
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), gtk_image_new_from_stock (GTK_STOCK_ADD, GTK_ICON_SIZE_MENU));
gtk_widget_show_all (item);
- g_signal_connect_swapped (G_OBJECT (item),
+ g_signal_connect_swapped (G_OBJECT (item),
"activate",
- G_CALLBACK (add_from_menu_cb),
+ G_CALLBACK (add_from_menu_cb),
button);
/**/
@@ -907,9 +907,9 @@
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), gtk_image_new_from_stock (GTK_STOCK_ADD, GTK_ICON_SIZE_MENU));
gtk_widget_show_all (item);
- g_signal_connect_swapped (G_OBJECT (item),
+ g_signal_connect_swapped (G_OBJECT (item),
"activate",
- G_CALLBACK (add_space_cb),
+ G_CALLBACK (add_space_cb),
button);
/**/
@@ -919,9 +919,9 @@
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), gtk_image_new_from_stock (GTK_STOCK_NEW, GTK_ICON_SIZE_MENU));
gtk_widget_show_all (item);
- g_signal_connect_swapped (G_OBJECT (item),
+ g_signal_connect_swapped (G_OBJECT (item),
"activate",
- G_CALLBACK (add_launcher_cb),
+ G_CALLBACK (add_launcher_cb),
button);
/**/
@@ -935,9 +935,9 @@
item = gtk_image_menu_item_new_from_stock (GTK_STOCK_REMOVE, NULL);
gtk_widget_show_all (item);
gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), item);
- g_signal_connect_swapped (G_OBJECT (item),
+ g_signal_connect_swapped (G_OBJECT (item),
"activate",
- G_CALLBACK (item_remove_cb),
+ G_CALLBACK (item_remove_cb),
button);
/**/
@@ -946,9 +946,9 @@
gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), item);
gtk_widget_show_all (item);
- g_signal_connect_swapped (G_OBJECT (item),
+ g_signal_connect_swapped (G_OBJECT (item),
"activate",
- G_CALLBACK (item_move_cb),
+ G_CALLBACK (item_move_cb),
button);
}
@@ -980,7 +980,7 @@
}
-static void
+static void
drag_data_received (GtkWidget *widget,
GdkDragContext *context,
int x,
@@ -1024,7 +1024,7 @@
if (button != NULL) {
int button_pos;
button_pos = get_child_position (quick_box, button);
- if (button_pos != -1)
+ if (button_pos != -1)
quick_box_reorder_child (quick_box, button, pos);
}
@@ -1058,12 +1058,12 @@
char *full_key;
GList *children, *scan;
GSList *uri_list = NULL;
-
+
children = gtk_container_get_children (GTK_CONTAINER (quick_lounge->quick_box));
for (scan = children; scan; scan = scan->next) {
GtkWidget *child_widget = scan->data;
GnomeDesktopItem *ditem;
-
+
if (QUICK_IS_SEPARATOR (child_widget)) {
uri_list = g_slist_prepend (uri_list, g_strdup (""));
continue;
@@ -1096,12 +1096,12 @@
{
GFile *file;
char *path;
-
+
file = g_file_new_for_uri (quick_lounge->location);
path = g_file_get_path (file);
-
+
g_object_unref (file);
-
+
return path;
}
@@ -1148,8 +1148,8 @@
if (*filename == 0)
uri = g_strdup ("");
else
- uri = g_build_filename (quick_lounge->location,
- filename,
+ uri = g_build_filename (quick_lounge->location,
+ filename,
NULL);
result = g_list_prepend (result, uri);
@@ -1164,9 +1164,9 @@
static void
-load_uri__step2 (GList *files,
- GList *dirs,
- GError *error,
+load_uri__step2 (GList *files,
+ GList *dirs,
+ GError *error,
gpointer data)
{
QuickLounge *quick_lounge = data;
@@ -1174,7 +1174,7 @@
GList *folder_list = NULL;
GList *order_list = NULL;
GList *scan;
-
+
quick_lounge->loading = FALSE;
if (error != NULL) {
@@ -1189,14 +1189,14 @@
folder_list = path_list_dup (files);
for (scan = folder_list; order_list && scan;) {
char *path = scan->data;
-
+
if (path_in_list (order_list, path)) {
folder_list = g_list_remove_link (folder_list, scan);
g_list_free (scan);
g_free (path);
-
+
scan = folder_list;
- }
+ }
else
scan = scan->next;
}
@@ -1208,7 +1208,7 @@
for (scan = folder_list; scan; scan = scan->next) {
char *uri = scan->data;
- if (*uri == 0)
+ if (*uri == 0)
quick_box_add_separator (quick_box, -1);
else if (is_desktop_file (uri))
quick_box_add_button (quick_box, uri, -1);
@@ -1224,7 +1224,7 @@
void
-quick_lounge_load_uri_async (QuickLounge *quick_lounge,
+quick_lounge_load_uri_async (QuickLounge *quick_lounge,
const char *uri)
{
QuickBox *quick_box = quick_lounge->quick_box;
@@ -1254,7 +1254,7 @@
void
-quick_lounge_load_uri_sync (QuickLounge *quick_lounge,
+quick_lounge_load_uri_sync (QuickLounge *quick_lounge,
const char *uri)
{
GList *children = NULL, *scan;
@@ -1289,7 +1289,7 @@
file_list = g_list_remove_link (file_list, scan);
g_list_free (scan);
g_free (path);
-
+
scan = file_list;
} else
scan = scan->next;
@@ -1302,9 +1302,9 @@
for (scan = files; scan; scan = scan->next) {
char *uri = scan->data;
- if (*uri == 0)
+ if (*uri == 0)
quick_box_add_separator (quick_box, -1);
- else if (is_desktop_file (uri))
+ else if (is_desktop_file (uri))
quick_box_add_button (quick_box, uri, -1);
}
@@ -1319,7 +1319,7 @@
void
-quick_lounge_load_uri (QuickLounge *quick_lounge,
+quick_lounge_load_uri (QuickLounge *quick_lounge,
const char *uri)
{
quick_lounge_load_uri_sync (quick_lounge, uri);
@@ -1327,30 +1327,30 @@
void
-quick_lounge_set_min_visible_cols (QuickLounge *quick_lounge,
+quick_lounge_set_min_visible_cols (QuickLounge *quick_lounge,
int cols)
{
GError *error = NULL;
if (cols >= quick_box_get_max_visible_cols (quick_lounge->quick_box))
cols = quick_box_get_min_visible_cols (quick_lounge->quick_box);
-
+
quick_box_set_min_visible_cols (quick_lounge->quick_box, cols);
panel_applet_gconf_set_int (PANEL_APPLET (quick_lounge->applet),
PREFS_MIN_VISIBLE_COLS,
cols,
&error);
- if (error != NULL)
+ if (error != NULL)
_gtk_error_dialog_from_gerror_run (NULL, &error);
}
void
-quick_lounge_set_max_size (QuickLounge *quick_lounge,
+quick_lounge_set_max_size (QuickLounge *quick_lounge,
int value)
{
GError *error = NULL;
-
+
if (value <= quick_box_get_min_visible_cols (quick_lounge->quick_box))
value = quick_box_get_max_visible_cols (quick_lounge->quick_box);
@@ -1359,23 +1359,23 @@
PREFS_MAX_VISIBLE_COLS,
value,
&error);
- if (error != NULL)
+ if (error != NULL)
_gtk_error_dialog_from_gerror_run (NULL, &error);
}
void
-quick_lounge_set_icon_size_follows_panel (QuickLounge *quick_lounge,
+quick_lounge_set_icon_size_follows_panel (QuickLounge *quick_lounge,
gboolean value)
{
GError *error = NULL;
-
+
quick_box_set_icon_size_follows_panel (quick_lounge->quick_box, value);
panel_applet_gconf_set_bool (PANEL_APPLET (quick_lounge->applet),
PREFS_ICON_SIZE_FOLLOWS_PANEL,
value,
&error);
- if (error != NULL)
+ if (error != NULL)
_gtk_error_dialog_from_gerror_run (NULL, &error);
}
@@ -1386,7 +1386,7 @@
static int n = 0;
char *base_dir;
char *unique_dir = NULL;
-
+
base_dir = g_build_filename (g_get_home_dir (), BASE_DIR, NULL);
ensure_dir_exists (base_dir, 0700, NULL);
@@ -1417,7 +1417,7 @@
static void
copy_default_items_to_uri (const char *to_uri)
{
- static char * default_items [] = {
+ static char * default_items [] = {
/* FIXME : put default items here. */
"nautilus.desktop",
"gnome-terminal.desktop",
@@ -1430,14 +1430,14 @@
char *source_uri;
char *dest_uri;
- source_uri = g_build_filename ("file://",
- DATADIR,
- "applications",
+ source_uri = g_build_filename ("file://",
+ DATADIR,
+ "applications",
default_items[i],
NULL);
- dest_uri = g_build_filename (to_uri,
- default_items[i],
- NULL);
+ dest_uri = g_build_filename (to_uri,
+ default_items[i],
+ NULL);
file_copy (source_uri, dest_uri);
@@ -1472,9 +1472,9 @@
quick_lounge->size = panel_applet_get_size (applet);
quick_lounge->orientation = panel_applet_get_orient (applet);
- quick_lounge->ditem_hash = g_hash_table_new_full (g_str_hash,
+ quick_lounge->ditem_hash = g_hash_table_new_full (g_str_hash,
g_str_equal,
- g_free,
+ g_free,
NULL);
quick_lounge->icon_theme = gtk_icon_theme_get_default ();
@@ -1483,7 +1483,7 @@
panel_applet_add_preferences (applet, "/schemas/apps/quick-lounge-applet/prefs", &error);
if (error != NULL) {
- g_print (error->message);
+ g_print ("%s", error->message);
g_clear_error (&error);
}
@@ -1524,39 +1524,39 @@
GTK_DEST_DEFAULT_ALL,
target_table, G_N_ELEMENTS (target_table),
GDK_ACTION_COPY | GDK_ACTION_MOVE);
-
- g_signal_connect (G_OBJECT (quick_lounge->quick_box),
+
+ g_signal_connect (G_OBJECT (quick_lounge->quick_box),
"drag_data_received",
- G_CALLBACK (drag_data_received),
+ G_CALLBACK (drag_data_received),
quick_lounge);
/**/
- uri = panel_applet_gconf_get_string (applet,
- PREFS_LOCATION,
+ uri = panel_applet_gconf_get_string (applet,
+ PREFS_LOCATION,
&error);
if ((error != NULL) || (uri == NULL) || (*uri == 0)) {
char *path;
-
+
g_clear_error (&error);
-
+
path = get_unique_dirname ();
uri = g_strconcat ("file://", path, NULL);
g_free (path);
-
+
error = NULL;
panel_applet_gconf_set_string (applet, PREFS_LOCATION, uri,
&error);
- if (error != NULL)
+ if (error != NULL)
_gtk_error_dialog_from_gerror_run (NULL, &error);
-
+
copy_default_items_to_uri (uri);
}
- g_signal_connect (G_OBJECT (applet),
+ g_signal_connect (G_OBJECT (applet),
"button_press_event",
- G_CALLBACK (applet_button_press_cb),
+ G_CALLBACK (applet_button_press_cb),
NULL);
/**/
@@ -1587,12 +1587,12 @@
"change_background",
G_CALLBACK (applet_change_background),
quick_lounge);
- g_signal_connect (G_OBJECT (applet),
+ g_signal_connect (G_OBJECT (applet),
"size_request",
G_CALLBACK (applet_size_request),
quick_lounge);
- g_signal_connect (G_OBJECT (applet),
+ g_signal_connect (G_OBJECT (applet),
"size_allocate",
G_CALLBACK (applet_size_allocate),
quick_lounge);
@@ -1630,5 +1630,5 @@
PANEL_TYPE_APPLET,
"quick-lounge-applet",
"0",
- quick_lounge_factory,
+ quick_lounge_factory,
NULL)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
